Merge commit 'HEAD'; branch 'master' into rewrite-sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Wed, 10 Dec 2008 00:32:52 +0000 (09:32 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Wed, 10 Dec 2008 00:32:52 +0000 (09:32 +0900)

Trivial merge