danno - 2009-06-17

Potential fix with VERY LIMITED TESTING performed.