Merge branch '1.24'
authorBehdad Esfahbod <behdad@behdad.org>
Mon, 20 Jul 2009 21:18:19 +0000 (17:18 -0400)
committerBehdad Esfahbod <behdad@behdad.org>
Mon, 20 Jul 2009 21:18:19 +0000 (17:18 -0400)
commit47ab634106a27b49085d26150999380e18bd3946
treed2d43d2bf546f8a8b1995b79a5f2a6c1cf1b1964
parent1eadda908f0f9262dcb4c301f487b5a190dc0e54
parenta7d12be6599f9e833cc1e623c8c103128adee8f2
Merge branch '1.24'