Merge branch 'devel'
authorImran Zaman <imran.zaman@linux.intel.com>
Mon, 30 Jun 2014 12:38:58 +0000 (15:38 +0300)
committerImran Zaman <imran.zaman@linux.intel.com>
Mon, 30 Jun 2014 12:38:58 +0000 (15:38 +0300)

Trivial merge