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)
commit9144273b2a138d020e1e7ba855847dfff985c0b1
tree714a260f8b805210ee6c4d0bdfb239b932a1250f
parent5f1f3eb2b247fc1beed22d590df77251b739ed67
parent78381bc40dce1b64d7273a4da185650cde952e43
Merge branch 'devel'