Automated merge with https://robotframework.googlecode.com/hg/
Automated merge with https://robotframework.googlecode.com/hg/

ldtri0209/robotframework,waldenner/robotframework,waldenner/robotframework,ldtri0209/robotframework,waldenner/robotframework,fiuba08/robotframework,fiuba08/robotframework,ldtri0209/robotframework,waldenner/robotframework,fiuba08/robotframework,ldtri0209/robotframework,ldtri0209/robotframework,fiuba08/robotframework,fiuba08/robotframework,waldenner/robotframework