Merge commit 'git/master'master
commit07827905813bce9cadb9db2faac5848a61c7e69f
authorSam Hocevar <sam@zoy.org>
Tue, 24 Mar 2009 16:57:22 +0000 (24 17:57 +0100)
committerSam Hocevar <sam@zoy.org>
Tue, 24 Mar 2009 16:57:22 +0000 (24 17:57 +0100)
treee230f9317fea0f4702206c26d3d9d46c8fd1f854
parentdd61355adadf8b3405bb95f1d1b2796a00262a48
parentedbc25c5b377d6fe768cefcc8614cd254a9fc4ff
Merge commit 'git/master'