bugfix: timeout has to be < oo !
Merge pull request #225 from joergkappes/RC-2.3

bugfix: timeout has to be < oo !
Merge pull request #25 from opengm/RC-2.3

from rc2.3