Code

Linking in 0.48pre1 branch
authorTed Gould <ted@gould.cx>
Thu, 17 Jun 2010 19:03:11 +0000 (14:03 -0500)
committerTed Gould <ted@gould.cx>
Thu, 17 Jun 2010 19:03:11 +0000 (14:03 -0500)

Trivial merge