Merge branch 'master' into derm8
commit20dbc1efdc2f829b70af4943f9c6657b7aee0429
authorJean-loup Gailly <jloup@gailly.net>
Thu, 14 Jul 2011 19:37:13 +0000 (14 21:37 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Thu, 14 Jul 2011 19:37:13 +0000 (14 21:37 +0200)
treeceaa9a60608f6f4c1cef67b8988084ca25c7dcd1
parent0229b9a30899a0b30bef9b7af9bbfa49e65b8e72
parentb6b781d8d358099d5185b920b374e5ed46d5ed96
Merge branch 'master' into derm8