Merge branch 't/patch707'
commitce9f1d858c1857bfe0472105eead367a6a04c710
authorBastien Guerry <bzg@altern.org>
Tue, 22 Mar 2011 09:44:53 +0000 (22 10:44 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 22 Mar 2011 09:44:53 +0000 (22 10:44 +0100)
treee98f472f191dbfe97e301eeae566698b963000b5
parentf702991626896d59ebb4cb8056eb3ff3ffbae19f
parent70b8d8397f2351fe7c3bdaa75297c89a36a7738b
Merge branch 't/patch707'