Merge branch 'devel' into upstream
authorImran Zaman <imran.zaman@intel.com>
Tue, 17 Feb 2015 13:00:53 +0000 (15:00 +0200)
committerImran Zaman <imran.zaman@intel.com>
Tue, 17 Feb 2015 13:01:49 +0000 (15:01 +0200)
Change-Id: Id66c04b2dbf7712805df5bdb8e19f36ef20edc28


Trivial merge