pulling in aleho's changes

Created by: tstriker

got some time to review the changes - thanks, aleho - looks solid!

aleho - i'm adding you to the hamsterproject, from now feel free to commit stuff there - also you can add me to gtalk (toms.baugis) if ya wanna :)