Merge branch 'upstream' master
authorThibaut GRIDEL <tgridel@free.fr>
Tue, 28 Dec 2010 21:16:42 +0000 (22:16 +0100)
committerThibaut GRIDEL <tgridel@free.fr>
Tue, 28 Dec 2010 21:16:42 +0000 (22:16 +0100)

Trivial merge