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

commit a87744f297ed00176ebeb6a45d9b3c0b596264af
Author: Lars Butler <Lars.Butler@gmail.com>
Date:   Mon Dec 6 11:53:47 2010 +0100

    Cherry picked fabfile updates from deploy-fabfile branch


Former-commit-id: 80205dfdabaf35dd81e0c65814cf4b843311224f [formerly 80205dfdabaf35dd81e0c65814cf4b843311224f [formerly a5db577d38b8b7e7fe789737e09fb228ebda57b2]]
Former-commit-id: 7403d7cbe077e9df242fb1a9b7ae3355739467b6
Former-commit-id: bbbb2a0522892bffc7949c548fe3bc27a59fe0df
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine