Merge branch 'bugzilla-14782' into release
authorLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 07:19:55 +0000 (02:19 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 07:19:55 +0000 (02:19 -0500)

Trivial merge