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)
commitfbd2194031738e255e7b1297f2c7e612c1a6944e
tree79630c5d614814f35392bbd955ac93c0e895587a
parentbbcd45eab0adfc1c46c6d1d6aad877eff8ee3a5c
parente57e8c3825df6800ace741a7798ca96c6e9a577e
Merge branch 'upstream'