am 9923125f: Merge "Set the version number to 1.0" into gingerbread
Jeff Hamilton [Thu, 28 Oct 2010 07:34:35 +0000 (00:34 -0700)]

Trivial merge