Merge commit 'origin/master'; commit 'savannah/master'
authorJohn Darrington <john@darrington.wattle.id.au>
Sat, 10 Jan 2009 00:11:53 +0000 (09:11 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 10 Jan 2009 00:11:53 +0000 (09:11 +0900)

Trivial merge