Merge branch 'master' into serializable
authorKevin Grittner <[email protected]>
Wed, 13 Oct 2010 14:14:32 +0000 (09:14 -0500)
committerKevin Grittner <[email protected]>
Wed, 13 Oct 2010 14:14:32 +0000 (09:14 -0500)

Trivial merge