Merge branch 'for-3.0' into for-3.1

This commit is contained in:
Mark Brown 2011-07-09 18:20:36 +09:00
commit 71ae391d45
3 changed files with 22 additions and 6 deletions