merge
work on using nonstandard oriented channels, use orientation not N,E codes
oops, merge commit on other branch

--HG--
branch : sod