Code

Linking in release branch
authorTed Gould <ted@gould.cx>
Sun, 23 May 2010 18:39:37 +0000 (13:39 -0500)
committerTed Gould <ted@gould.cx>
Sun, 23 May 2010 18:39:37 +0000 (13:39 -0500)

Trivial merge