Merge commit 'origin/roc'
authorJohn Darrington <john@darrington.wattle.id.au>
Thu, 23 Jul 2009 05:05:41 +0000 (07:05 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Thu, 23 Jul 2009 05:05:41 +0000 (07:05 +0200)

Trivial merge