Merge "Bug fix."
authorDon Dugger <donald.d.dugger@intel.com>
Tue, 1 Dec 2015 17:15:14 +0000 (17:15 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 1 Dec 2015 17:15:15 +0000 (17:15 +0000)

Trivial merge