Merge branch 'master' into bug6123
authorKevin Grittner <[email protected]>
Fri, 5 Aug 2011 16:20:49 +0000 (11:20 -0500)
committerKevin Grittner <[email protected]>
Fri, 5 Aug 2011 16:20:49 +0000 (11:20 -0500)

Trivial merge