Merge remote-tracking branch 'upstream/master'
authorPhilippe Auphelle <pauphelle@gmail.com>
Wed, 22 Feb 2012 13:31:11 +0000 (14:31 +0100)
committerPhilippe Auphelle <pauphelle@gmail.com>
Wed, 22 Feb 2012 13:31:11 +0000 (14:31 +0100)

Trivial merge