Merge branch 'develop' of less.ly:kraken-ui into develop
authordsc <dsc@less.ly>
Fri, 11 May 2012 21:04:57 +0000 (14:04 -0700)
committerdsc <dsc@less.ly>
Fri, 11 May 2012 21:04:57 +0000 (14:04 -0700)

Trivial merge