Commit 94711cad3b83445dfcf45a6e0b29b045e06a29f6

Carlos Martín Nieto 2011-05-17T12:12:59

Merge upstream/development