Merge branch 'orion/devel' into next/devel
authorOlof Johansson <olof@lixom.net>
Wed, 14 Dec 2011 03:35:03 +0000 (19:35 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 14 Dec 2011 03:35:03 +0000 (19:35 -0800)

Trivial merge