Merge branch 'highbank/devel' into next/devel
authorOlof Johansson <olof@lixom.net>
Tue, 13 Dec 2011 23:01:23 +0000 (15:01 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 13 Dec 2011 23:01:23 +0000 (15:01 -0800)

Trivial merge