Merge branch 'master' of http://git.roojs.com:8081/Pman.Core
authorAlan Knowles <alan@roojs.com>
Wed, 23 May 2012 01:04:37 +0000 (09:04 +0800)
committerAlan Knowles <alan@roojs.com>
Wed, 23 May 2012 01:04:37 +0000 (09:04 +0800)

Trivial merge