Merge remote-tracking branch 'upstream-repo/master' into upstream upstream/2.2.1
authorBenjamin Cama <benoar@dolka.fr>
Thu, 7 Jul 2011 10:47:12 +0000 (12:47 +0200)
committerBenjamin Cama <benoar@dolka.fr>
Thu, 7 Jul 2011 10:47:12 +0000 (12:47 +0200)

Trivial merge