Merge branch 'uncontroversial' into accel
authorNathan Bird <nathan@acceleration.net>
Fri, 20 Feb 2009 21:07:17 +0000 (16:07 -0500)
committerNathan Bird <nathan@acceleration.net>
Fri, 20 Feb 2009 21:07:17 +0000 (16:07 -0500)

Trivial merge