Merge branches 'bugzilla-11884' and 'bugzilla-8544' into release
authorLen Brown <len.brown@intel.com>
Fri, 16 Jan 2009 19:45:11 +0000 (14:45 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 16 Jan 2009 19:45:11 +0000 (14:45 -0500)

Trivial merge