Merge branch 'bugzilla-13449' into release
authorLen Brown <len.brown@intel.com>
Fri, 6 Nov 2009 06:45:11 +0000 (01:45 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 6 Nov 2009 06:45:11 +0000 (01:45 -0500)

Trivial merge