Merge branch 'master' into rave2
commit9eafb556e2f92df61b6cbf88450ba1afc9d2ac69
authorJean-loup Gailly <jloup@gailly.net>
Mon, 8 Aug 2011 09:41:40 +0000 (8 11:41 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Mon, 8 Aug 2011 09:41:40 +0000 (8 11:41 +0200)
treed2a906863af4d9967b139501b789d6b182d05ea0
parente9df2b636276384dfcf9e1837aa37d9efc4907fd
parentc00109bd93b297797557d588a98930a132f785a0
Merge branch 'master' into rave2