Merge commit 'jason/master'
t0m [Wed, 19 Aug 2009 19:39:13 +0000 (20:39 +0100)]

Trivial merge