Merge branch 'master' into derm4
commitdbdb248fab408abd76ec01147fd4fa6e05ccd532
authorJean-loup Gailly <jloup@gailly.net>
Thu, 9 Sep 2010 23:00:20 +0000 (10 01:00 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Thu, 9 Sep 2010 23:00:20 +0000 (10 01:00 +0200)
treecaa8cb3c03a672ada6c533e8dedbc2a93c46d947
parentd64aecc303b4f1999eb38375b2e739a55f7bbfc2
parent2a94a9886baeacbfbb0ab7518155cf083f93c772
Merge branch 'master' into derm4