Merge branch 'next/maintainers' into HEAD
authorOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:16:11 +0000 (14:16 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:16:11 +0000 (14:16 -0700)

Trivial merge