Merge branch 'master' of less.ly:kraken-ui
authordsc <dsc@wikimedia.org>
Mon, 9 Apr 2012 23:25:43 +0000 (16:25 -0700)
committerdsc <dsc@wikimedia.org>
Mon, 9 Apr 2012 23:25:43 +0000 (16:25 -0700)

Trivial merge