Merge branch 'highbank/devel' into next/devel

This commit is contained in:
Olof Johansson 2011-12-13 15:01:23 -08:00
commit 00e929808a