merge lsx -> default
authorConnor Lane Smith <cls@lubutu.com>
Thu, 23 Jun 2011 19:27:28 +0000 (20:27 +0100)
committerConnor Lane Smith <cls@lubutu.com>
Thu, 23 Jun 2011 19:27:28 +0000 (20:27 +0100)

Trivial merge