Merge branch 'master' into derm6
commita72226a53254bbd822807f38a1a26eb46847b1c5
authorJean-loup Gailly <jloup@gailly.net>
Sun, 16 Jan 2011 21:01:00 +0000 (16 22:01 +0100)
committerJean-loup Gailly <jloup@gailly.net>
Sun, 16 Jan 2011 21:01:00 +0000 (16 22:01 +0100)
tree3b5349384897e3c8d5b7a0cc2031c9d76dd5b557
parent226081302cdc2acedd7a658383b484e835b4d877
parent0c30fbd0d5c35c4b73569bf1bc87b692b122dd1b
Merge branch 'master' into derm6