Merge branch 'upstream'
authorBenjamin Cama <benoar@dolka.fr>
Thu, 28 Jul 2011 15:59:33 +0000 (17:59 +0200)
committerBenjamin Cama <benoar@dolka.fr>
Thu, 28 Jul 2011 15:59:33 +0000 (17:59 +0200)

Trivial merge