Merge branch 'v1.0.x'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 9 Dec 2013 13:07:07 +0000 (15:07 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 9 Dec 2013 13:07:07 +0000 (15:07 +0200)
commit4670ce2a451f2614cdf9100e3515cf3b37267a1c
treea3674a6e10c4bc17743d321ea717a3936a6a88b9
parentb6fc6494ea9165657918f5955dabc98c40a3320d
parent20ac23879c298b7db30c26738c7de8c83b4e08df
Merge branch 'v1.0.x'