Already merged to trunk

Deleted: branches/ndis_wip_22102004/