Fix for lp:777672
authorBrian Aker <brian@tangent.org>
Sat, 20 Aug 2011 07:04:21 +0000 (00:04 -0700)
committerBrian Aker <brian@tangent.org>
Sat, 20 Aug 2011 07:04:21 +0000 (00:04 -0700)

Trivial merge