Merge branch 'master' into atomic2
commit7725a91599caff176c1e92a2cb68f96789ff5039
authorJean-loup Gailly <jloup@gailly.net>
Wed, 27 Jul 2011 23:06:17 +0000 (28 01:06 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Wed, 27 Jul 2011 23:06:17 +0000 (28 01:06 +0200)
tree1340b325288f8fadc44b65ca4b2e1e4d71475d68
parentc8954220919ef66440d150dacf7ef8d0bcfc8aa3
parentf639bf9441b1c075c094d453a432f641b4945a2b
Merge branch 'master' into atomic2