Merge move from trunk

[SVN r78592]
This commit is contained in:
Ion Gaztañaga
2012-05-24 17:02:29 +00:00
parent 9127a41803
commit fd7aaebd3f