Merged changes on the version-0.5.x branch to the trunk.
authorJoel Rosdahl <joel@rosdahl.net>
Mon, 30 Jan 2006 18:41:47 +0000 (18:41 +0000)
committerJoel Rosdahl <joel@rosdahl.net>
Mon, 30 Jan 2006 18:41:47 +0000 (18:41 +0000)

Trivial merge