Merge branch 'next/fixes-non-critical' into HEAD
authorOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:07:32 +0000 (14:07 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:07:32 +0000 (14:07 -0700)

Trivial merge