Merge branch 'for-3.0' into for-3.1

This commit is contained in:
Mark Brown 2011-06-10 11:03:54 +01:00
commit 0f28f8e567