Code

Sync to release 0.48 branch
authorTed Gould <ted@gould.cx>
Fri, 13 Aug 2010 16:29:18 +0000 (11:29 -0500)
committerTed Gould <ted@gould.cx>
Fri, 13 Aug 2010 16:29:18 +0000 (11:29 -0500)

Trivial merge