Merge branch 'master' of less.ly:kraken-ui
authordsc <dsc@less.ly>
Wed, 2 May 2012 22:43:54 +0000 (15:43 -0700)
committerdsc <dsc@less.ly>
Wed, 2 May 2012 22:43:54 +0000 (15:43 -0700)

Trivial merge