Merge commit 'github/master'
Tomas Doran (t0m) [Mon, 22 Mar 2010 11:33:00 +0000 (11:33 +0000)]

Trivial merge