Merge branch 'master' into atomic2
commit1eaef13587fb1e5b2568b6ecb803201cf4ea14d2
authorJean-loup Gailly <jloup@gailly.net>
Wed, 3 Aug 2011 18:52:38 +0000 (3 20:52 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Wed, 3 Aug 2011 18:52:38 +0000 (3 20:52 +0200)
treed3c6474c7bc7f294cbc34aa9198864ae4d25bada
parent53fb8be1eafe514941d588677ea791287ef910d3
parentd1169d91289bf0394a3b6885cfa130bad1356eb4
Merge branch 'master' into atomic2