Automated merge with https://code.google.com/p/robotframework/
Automated merge with https://code.google.com/p/robotframework/

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