Merge branch 'master' into derm4
commitd64aecc303b4f1999eb38375b2e739a55f7bbfc2
authorJean-loup Gailly <jloup@gailly.net>
Thu, 9 Sep 2010 22:41:52 +0000 (10 00:41 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Thu, 9 Sep 2010 22:41:52 +0000 (10 00:41 +0200)
tree94ca05cba9de1cbfa96848e7ddbf57161178438c
parent01825b69295771e99adde3a915d6279cc9fb6b85
parent44b138a99da02c5976059f00fc1d6c1c3bc8ec1e
Merge branch 'master' into derm4