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

Trivial merge