Merge remote branch 'savannah/master'
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 8 Jul 2011 13:53:37 +0000 (15:53 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 8 Jul 2011 13:53:37 +0000 (15:53 +0200)

Trivial merge