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)
commit5360cd19fe9a517c431f12bf8898dd99bcddf146
tree3ab2d0e81cffa0d9fe48c64402ce35a0ec8e9b83
parenta2c58448f96790b48fb48f4dac923fe63cd3a261
parent6a71d8a5e691d1866d4d37a359d41ad3d4d8500d
Merge branch 'api-compatible' into devel