Merge branch 'master' into people/jnap/migrate_xmltags
John Napiorkowski [Thu, 23 Jun 2011 22:44:31 +0000 (18:44 -0400)]

Trivial merge