Updating Geronimo Trunk for 1.2 - Please wait before commting into trunk for a little while.

[Matt Hogstrom]

I'm on Irc if anyone has questions.  I am in the process of implementing 
Geronimo-2053 to get 1.2 setup.