Merge commit 'savannah/master'
authorJohn Darrington <john@darrington.wattle.id.au>
Wed, 7 Jan 2009 22:20:47 +0000 (07:20 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Wed, 7 Jan 2009 22:20:47 +0000 (07:20 +0900)

Trivial merge