merged [69540], [69632] and [69720] from trunk

[SVN r71767]
This commit is contained in:
Joaquín M López Muñoz 2011-05-06 19:38:25 +00:00
parent ecf3e7f356
commit 72b6370259

@ -1 +1 @@
Subproject commit 768432afcbb80019d86d5f6d0aa61b94281fbcbd
Subproject commit 84e34e45c321014d446317c672be3dd077c5d088