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