Merge branch 'bugzilla-13002' into release
authorLen Brown <len.brown@intel.com>
Sat, 5 Sep 2009 17:38:34 +0000 (13:38 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 5 Sep 2009 17:38:34 +0000 (13:38 -0400)

Trivial merge