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)
commita5f039742fa3d25829d788edff0e84bdc41401f7
tree16eaafd34bdccebd7c6aef1f8ca35a6bc8582132
parentc87f1a554cce74ac1ba3d4e7e9c2a1d2904e4766
parentf9bdaf620aab27a23bd4bb7b19d2597c3eef2c9c
Merge in Ubuntu fixes.