Merge branch 'master' into serializable
authorKevin Grittner <[email protected]>
Tue, 23 Nov 2010 15:12:45 +0000 (09:12 -0600)
committerKevin Grittner <[email protected]>
Tue, 23 Nov 2010 15:12:45 +0000 (09:12 -0600)

Trivial merge