Merge branch 'devel'
authorImran Zaman <imran.zaman@linux.intel.com>
Wed, 2 Jul 2014 10:05:44 +0000 (13:05 +0300)
committerImran Zaman <imran.zaman@linux.intel.com>
Wed, 2 Jul 2014 10:05:44 +0000 (13:05 +0300)

Trivial merge