Merge branch 'master' into serializable
authorKevin Grittner <[email protected]>
Fri, 19 Nov 2010 16:05:09 +0000 (10:05 -0600)
committerKevin Grittner <[email protected]>
Fri, 19 Nov 2010 16:05:09 +0000 (10:05 -0600)

Trivial merge