Update from trunk to launchpad
authorBrian Aker <brian@tangent.org>
Wed, 27 Jul 2011 18:56:27 +0000 (11:56 -0700)
committerBrian Aker <brian@tangent.org>
Wed, 27 Jul 2011 18:56:27 +0000 (11:56 -0700)

Trivial merge