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

Trivial merge