Merge branch 'derm'
commitfba55ca3cbe33d4cd74692313ec912beeba755ce
authorJean-loup Gailly <jloup@gailly.net>
Tue, 6 Apr 2010 20:57:39 +0000 (6 22:57 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Tue, 6 Apr 2010 20:57:39 +0000 (6 22:57 +0200)
treed2983e61ca4c1c89a4e96a860c54b227a7014b60
parent111894fc61ae1ed16b01c0de78350fcbf0212bf7
parenta23d016de35cfc0c9199f3c9b996f095b171c667
Merge branch 'derm'