Merge branch 'master' of http://git.roojs.com:8081/Pman.Core
authorAlan Knowles <alan@akbkhome.com>
Fri, 29 Jul 2011 05:49:34 +0000 (13:49 +0800)
committerAlan Knowles <alan@akbkhome.com>
Fri, 29 Jul 2011 05:49:34 +0000 (13:49 +0800)

Trivial merge