Code

Pulling in a more recent trunk
authorTed Gould <ted@gould.cx>
Sat, 15 May 2010 19:05:39 +0000 (14:05 -0500)
committerTed Gould <ted@gould.cx>
Sat, 15 May 2010 19:05:39 +0000 (14:05 -0500)

Trivial merge