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

Trivial merge