Merge branch 'master' of less.ly:kraken-ui
authordsc <dsc@less.ly>
Tue, 10 Apr 2012 00:45:43 +0000 (17:45 -0700)
committerdsc <dsc@less.ly>
Tue, 10 Apr 2012 00:45:43 +0000 (17:45 -0700)

Trivial merge