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)
commit9dffc9de96014e24d1fd1030a79317ba34c504e8
treeee2758eb5293ac9bea081935529d073479cd4f1b
parent42c9226fc71c19af4d755c6900120bfa07f7e99c
parent5a44d59fac1aa6104956f4d5dbeef567169c32c0
Merge branch 'upstream'