Revert "Merging develop-vrp 20130103..."

This reverts commit cea858e01d97a924e01e49b11e1dc273011995c0.