Merge branch 'v1.0.x'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tue, 3 Dec 2013 16:29:34 +0000 (18:29 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tue, 3 Dec 2013 16:29:34 +0000 (18:29 +0200)
commit56642fbfea6397a0db561d76a9c3f26197de87b7
treed86b20f736c3a32fee6ecfd59ac391f82e5abe28
parent0b42ea8d0f08473d2380540d2c57646d4043e92a
parent0e97d36d3e7188106682ff682573fbb73cc783a2
Merge branch 'v1.0.x'