merge changes with timeout change
authorRobert Kaiser <kairo@kairo.at>
Sun, 7 Jul 2013 21:44:05 +0000 (23:44 +0200)
committerRobert Kaiser <kairo@kairo.at>
Sun, 7 Jul 2013 21:44:05 +0000 (23:44 +0200)

Trivial merge