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

Trivial merge