Commit 8bd6c0ab8354fff51f0afaa15a56a9f864da7ab5

Carlos Martín Nieto 2011-04-06T15:49:29

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