Merge commit 'origin/master' into development
authorNathan Bird <nathan@acceleration.net>
Fri, 29 Jan 2010 20:11:52 +0000 (15:11 -0500)
committerNathan Bird <nathan@acceleration.net>
Fri, 29 Jan 2010 20:11:52 +0000 (15:11 -0500)

Trivial merge