Merge remote-tracking branch 'origin/master' into 0.11
authorEdward Hervey <bilboed@bilboed.com>
Wed, 21 Sep 2011 11:42:58 +0000 (13:42 +0200)
committerEdward Hervey <bilboed@bilboed.com>
Wed, 21 Sep 2011 11:42:58 +0000 (13:42 +0200)

Trivial merge