Merge branch 'devel' of h1dev:/srv/APKPM/
authorDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 14 Mar 2011 21:31:28 +0000 (21:31 +0000)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 14 Mar 2011 21:31:28 +0000 (21:31 +0000)

Trivial merge