Merge branch 'master' into serializable
authorKevin Grittner <[email protected]>
Fri, 22 Oct 2010 14:34:33 +0000 (09:34 -0500)
committerKevin Grittner <[email protected]>
Fri, 22 Oct 2010 14:34:33 +0000 (09:34 -0500)

Trivial merge