Merge branch 'development'
authorNathan Bird <nathan@acceleration.net>
Thu, 11 Feb 2010 19:26:04 +0000 (14:26 -0500)
committerNathan Bird <nathan@acceleration.net>
Thu, 11 Feb 2010 19:26:04 +0000 (14:26 -0500)

Trivial merge