Merge branch 'for-3.0' into for-3.1

This commit is contained in:
Mark Brown 2011-07-15 22:43:07 +09:00
commit 47d90a03eb