Merge branch 'master' into derm8
commitcc00148943a7534c8264ba05c5de59f40220fb3b
authorJean-loup Gailly <jloup@gailly.net>
Fri, 15 Jul 2011 14:37:04 +0000 (15 16:37 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Fri, 15 Jul 2011 14:37:04 +0000 (15 16:37 +0200)
tree1af5989c2d56dcf9d654c61282c1968b063c9d7f
parent20dbc1efdc2f829b70af4943f9c6657b7aee0429
parenteb43146707e209f91bed46ae50828ca7b3ea8795
Merge branch 'master' into derm8