Merge branch 'devel' of h1dev:/srv/APKPM/
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 13 Mar 2011 17:22:10 +0000 (17:22 +0000)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 13 Mar 2011 17:22:10 +0000 (17:22 +0000)

Trivial merge