Merge commit 'origin/master' into fusionax
authorStéphane Jacob <sj@m4x.org>
Mon, 20 Jul 2009 20:56:15 +0000 (22:56 +0200)
committerStéphane Jacob <sj@m4x.org>
Mon, 20 Jul 2009 20:56:15 +0000 (22:56 +0200)
commit43b816c7ed20f3b1dbb5c8b6971d8582016a7a86
tree9ba94b8d3cf26503a223c844b3c123015b1a16fd
parent429e4a4b8eb428e9631513fc6bb053b4635c7729
parente4a1bc55b6fb664e7857cb84a3eb0466ab4b59eb
Merge commit 'origin/master' into fusionax