Merge branch 'master' into atomic2
commit53fb8be1eafe514941d588677ea791287ef910d3
authorJean-loup Gailly <jloup@gailly.net>
Wed, 3 Aug 2011 18:07:09 +0000 (3 20:07 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Wed, 3 Aug 2011 18:07:09 +0000 (3 20:07 +0200)
tree1eefc4690907a478ff020fc689ac78b437a1061b
parent7725a91599caff176c1e92a2cb68f96789ff5039
parent7e92ae9cb6f59d0f83165f328b76c726983569fe
Merge branch 'master' into atomic2