Merge branch 'master' of less.ly:kraken-ui
authordsc <dsc@wikimedia.org>
Thu, 12 Apr 2012 22:27:26 +0000 (15:27 -0700)
committerdsc <dsc@wikimedia.org>
Thu, 12 Apr 2012 22:27:26 +0000 (15:27 -0700)

Trivial merge