Pull c2 into release branch
authorLen Brown <len.brown@intel.com>
Tue, 20 Mar 2007 15:06:37 +0000 (11:06 -0400)
committerLen Brown <len.brown@intel.com>
Tue, 20 Mar 2007 15:06:37 +0000 (11:06 -0400)

Trivial merge