Merge branch 'master' into serializable
authorKevin Grittner <[email protected]>
Fri, 5 Nov 2010 14:19:06 +0000 (09:19 -0500)
committerKevin Grittner <[email protected]>
Fri, 5 Nov 2010 14:19:06 +0000 (09:19 -0500)

Trivial merge