Merge branch 'devel' of h1dev:/srv/APKPM/
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 27 Mar 2011 18:47:33 +0000 (18:47 +0000)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 27 Mar 2011 18:47:33 +0000 (18:47 +0000)

Trivial merge