Merge commit '4e973902b22f17060af2b9535d697a2b90e361df' into github
authorAlan Knowles <alan@roojs.com>
Wed, 7 Sep 2011 01:13:52 +0000 (09:13 +0800)
committerAlan Knowles <alan@roojs.com>
Wed, 7 Sep 2011 01:13:52 +0000 (09:13 +0800)

Trivial merge