Merge branch 'devel'
authorImran Zaman <imran.zaman@linux.intel.com>
Fri, 4 Jul 2014 12:35:48 +0000 (15:35 +0300)
committerImran Zaman <imran.zaman@linux.intel.com>
Fri, 4 Jul 2014 12:35:48 +0000 (15:35 +0300)

Trivial merge