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)
commite5e120aeab09dc187066fce44d2e17dd3e02bb7a
tree27fcf9e479e09c9e2029179b3537f1719c8ef1f5
parent9a21675a599ca9ade656c1cb6bd7ca86982eb831
parenteb3c0025593e1274240bb7b16398cbc08bb2ad55
Merge branch 'devel' into upstream

Change-Id: Id66c04b2dbf7712805df5bdb8e19f36ef20edc28