Merge remote-tracking branch 'rafal-krypa/issue84' into v1.0.x
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Fri, 20 Dec 2013 08:02:38 +0000 (10:02 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Fri, 20 Dec 2013 08:02:38 +0000 (10:02 +0200)

Trivial merge