Merge branch 'derm6'
commita2b8df443947bd34f426d7b7571df0d3bd7e72d4
authorJean-loup Gailly <jloup@gailly.net>
Sun, 5 Dec 2010 01:19:29 +0000 (5 02:19 +0100)
committerJean-loup Gailly <jloup@gailly.net>
Sun, 5 Dec 2010 01:19:29 +0000 (5 02:19 +0100)
tree54bb17910d731e3ea162d9b3062cba49dcb7b0b0
parentc498eb27cd36f5f77e77556581339dc7f58adea1
parent71de9e76de8b74d2d1cb24dff3378eb09861fb20
Merge branch 'derm6'