Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 10 Jun 2011 10:03:54 +0000 (11:03 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 10 Jun 2011 10:03:54 +0000 (11:03 +0100)

Trivial merge