Merge branch 'develop' of less.ly:kraken-ui into develop
authorDavid Schoonover <dsc@wikimedia.org>
Thu, 28 Jun 2012 20:19:29 +0000 (13:19 -0700)
committerDavid Schoonover <dsc@wikimedia.org>
Thu, 28 Jun 2012 20:19:29 +0000 (13:19 -0700)

Trivial merge