Merge branch 'devel'
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Thu, 25 Oct 2012 11:27:22 +0000 (14:27 +0300)
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Thu, 25 Oct 2012 11:27:22 +0000 (14:27 +0300)

Trivial merge