took out namespace package stuff (because I don't understand it,
and it apparently is not needed).
Authored by: jswhit 2007-12-14
Parent: [r4735]
Child: [r4737]
