Merge branch 'master' into serializable
authorKevin Grittner <[email protected]>
Mon, 1 Nov 2010 14:56:17 +0000 (09:56 -0500)
committerKevin Grittner <[email protected]>
Mon, 1 Nov 2010 14:56:17 +0000 (09:56 -0500)

Trivial merge