Merge branch 'accel-2'
authorRuss Tyndall <russ@acceleration.net>
Wed, 27 Jul 2011 20:14:20 +0000 (16:14 -0400)
committerRuss Tyndall <russ@acceleration.net>
Wed, 27 Jul 2011 20:14:20 +0000 (16:14 -0400)

Trivial merge