Merge branch 'evan' into develop
authorerosen <erosen@wikimedia.org>
Fri, 29 Jun 2012 19:23:40 +0000 (12:23 -0700)
committererosen <erosen@wikimedia.org>
Fri, 29 Jun 2012 19:23:40 +0000 (12:23 -0700)

Trivial merge