Merge branch 'master' into rave2
commita2e1cfc9c10e27700ee930ec922fe441ae32aa91
authorJean-loup Gailly <jloup@gailly.net>
Mon, 8 Aug 2011 12:31:18 +0000 (8 14:31 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Mon, 8 Aug 2011 12:31:18 +0000 (8 14:31 +0200)
tree928b7eaa64aa8a343029313f22040b6938892ac0
parent9eafb556e2f92df61b6cbf88450ba1afc9d2ac69
parent9d3da44ed9fa17c83a626b9dd418aa4a579a5cef
Merge branch 'master' into rave2