merging the rest of the changes from my packages in tags 0.2 to trunk
Authored by: tfoote 2008-03-21
Parent: [r580]
Child: [r582]