2009-07-02Merged Jens' latest changes.
morrowa [Thu, 02 Jul 2009 20:45:11 -0700] rev 57
Merged Jens' latest changes.