Merge branch 'develop'
authorDavid Schoonover <dsc@wikimedia.org>
Sun, 1 Jul 2012 06:54:36 +0000 (23:54 -0700)
committerDavid Schoonover <dsc@wikimedia.org>
Sun, 1 Jul 2012 06:54:36 +0000 (23:54 -0700)

Trivial merge