Merge branch 'api-compatible' into devel
authorJussi Laako <jussi.laako@linux.intel.com>
Fri, 31 Jan 2014 14:55:30 +0000 (16:55 +0200)
committerJussi Laako <jussi.laako@linux.intel.com>
Fri, 31 Jan 2014 14:55:30 +0000 (16:55 +0200)

Trivial merge