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)

Trivial merge