Merge commit 'origin/stable'
authorJohn Darrington <john@darrington.wattle.id.au>
Sat, 9 May 2009 07:07:51 +0000 (15:07 +0800)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 9 May 2009 07:07:51 +0000 (15:07 +0800)

Trivial merge