Merge branch 'master' into serializable
authorKevin Grittner <[email protected]>
Wed, 27 Oct 2010 16:37:53 +0000 (11:37 -0500)
committerKevin Grittner <[email protected]>
Wed, 27 Oct 2010 16:37:53 +0000 (11:37 -0500)

Trivial merge