Merge branch 'master' into plugin_metadata
authorErich Smith <heartquest@gmail.com>
Fri, 11 May 2012 18:08:33 +0000 (14:08 -0400)
committerErich Smith <heartquest@gmail.com>
Fri, 11 May 2012 18:08:33 +0000 (14:08 -0400)

Trivial merge