Merge branch 'master' into serializable
authorKevin Grittner <[email protected]>
Wed, 1 Dec 2010 16:23:07 +0000 (10:23 -0600)
committerKevin Grittner <[email protected]>
Wed, 1 Dec 2010 16:23:07 +0000 (10:23 -0600)

Trivial merge