Merge branch 'master' of https://github.com/roojs/roojs1 into github github.com.roojs1.master origin/github.com.roojs1.master
authorAlan Knowles <alan@akbkhome.com>
Mon, 28 Feb 2011 10:30:28 +0000 (18:30 +0800)
committerAlan Knowles <alan@akbkhome.com>
Mon, 28 Feb 2011 10:30:28 +0000 (18:30 +0800)

Trivial merge