Merge branch 'master' of less.ly:kraken-ui
authordsc <dsc@less.ly>
Mon, 7 May 2012 20:28:15 +0000 (13:28 -0700)
committerdsc <dsc@less.ly>
Mon, 7 May 2012 20:28:15 +0000 (13:28 -0700)

Trivial merge