Merge remote-tracking branch 'asoc/fix/core' into tmp
authorMark Brown <[email protected]>
Thu, 10 Jan 2013 12:21:50 +0000 (12:21 +0000)
committerMark Brown <[email protected]>
Thu, 10 Jan 2013 12:21:50 +0000 (12:21 +0000)

Trivial merge