Merge in Ubuntu fixes.
authorBrian Aker <brian@tangent.org>
Mon, 18 Jul 2011 19:08:57 +0000 (12:08 -0700)
committerBrian Aker <brian@tangent.org>
Mon, 18 Jul 2011 19:08:57 +0000 (12:08 -0700)

Trivial merge