Merge branch 'develop' of less.ly:kraken-ui into develop d3-chart-element
authorerosen <erosen@wikimedia.org>
Fri, 29 Jun 2012 19:25:21 +0000 (12:25 -0700)
committererosen <erosen@wikimedia.org>
Fri, 29 Jun 2012 19:25:21 +0000 (12:25 -0700)

Trivial merge