Merge branches 'release', 'bugzilla-13032', 'bugzilla-13041+', 'bugzilla-13121',...
authorLen Brown <len.brown@intel.com>
Sat, 16 May 2009 05:55:59 +0000 (01:55 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 16 May 2009 05:55:59 +0000 (01:55 -0400)

Trivial merge