Merge branch 'devel' into upstream upstream upstream/1.0.4
authorImran Zaman <imran.zaman@linux.intel.com>
Fri, 13 Feb 2015 14:28:39 +0000 (16:28 +0200)
committerImran Zaman <imran.zaman@linux.intel.com>
Fri, 13 Feb 2015 14:39:07 +0000 (16:39 +0200)
Change-Id: Id6207a54212597614043e4503aaad4ead6bc6ed9
Signed-off-by: Imran Zaman <imran.zaman@linux.intel.com>

Trivial merge