Merge branch 'bugzilla-14858' into release
authorLen Brown <len.brown@intel.com>
Wed, 20 Jan 2010 06:14:57 +0000 (01:14 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 20 Jan 2010 06:14:57 +0000 (01:14 -0500)

Trivial merge