Commit ca8d2dfc0cea0c16e2d6bae16d95d652e292f473

Carlos Martín Nieto 2011-05-05T16:22:06

Merge remote-tracking branch 'upstream/development' into config