stuff reorg
[test7] / test2
2010-03-25 feristuff reorg master