Squashed commit of the following:
Squashed commit of the following:

commit 4c215f8e3d3dd4d431b9840cfaf5f1d7db8d54c4
Author: Andrea Cerisara <andreacerisara@gmail.com>
Date:   Fri Apr 8 10:53:52 2011 +0200

    Fixed unit test


Former-commit-id: 2b78b7ec4011277936604e4b7356c7153390d7d2 [formerly 75a8ee1108b6466d7cc1d282fd4b1b89544bb3b2]
Former-commit-id: 11154295551bec10248880bea8465eccd47a033b
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine