Merge branch 'master' into serializable
authorKevin Grittner <[email protected]>
Wed, 10 Nov 2010 15:59:01 +0000 (09:59 -0600)
committerKevin Grittner <[email protected]>
Wed, 10 Nov 2010 15:59:01 +0000 (09:59 -0600)

Trivial merge