merge default -> lsx
authorConnor Lane Smith <cls@lubutu.com>
Sun, 16 Oct 2011 17:13:29 +0000 (18:13 +0100)
committerConnor Lane Smith <cls@lubutu.com>
Sun, 16 Oct 2011 17:13:29 +0000 (18:13 +0100)

Trivial merge