Merge remote-tracking branch 'jsakkine/issue64' into v1.0.x
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 28 Nov 2013 16:04:12 +0000 (18:04 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 28 Nov 2013 16:04:12 +0000 (18:04 +0200)

Trivial merge