Merge branch 'master' into bug6123
authorKevin Grittner <[email protected]>
Mon, 1 Aug 2011 17:41:43 +0000 (12:41 -0500)
committerKevin Grittner <[email protected]>
Mon, 1 Aug 2011 17:41:43 +0000 (12:41 -0500)

Trivial merge