Merge branch 'next/maintainers' into HEAD

This commit is contained in:
Olof Johansson 2012-10-01 14:16:11 -07:00
commit f7b967bffe