Merge branch 'bugzilla-14379' into release
authorLen Brown <len.brown@intel.com>
Wed, 25 Nov 2009 05:04:48 +0000 (00:04 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 25 Nov 2009 05:04:48 +0000 (00:04 -0500)

Trivial merge