Commit 55c197cdd37b34c7b4877bc0434c297075e11222

Carlos Martín Nieto 2011-04-11T17:41:21

Merge upstream/development