nandseewindow: Move some things around
Merge branch 'master' of git://github.com/xobs/nandsee
sync up changes