merged [49289] and [52371] from trunk

[SVN r52944]
This commit is contained in:
Joaquín M López Muñoz 2009-05-12 20:01:46 +00:00
parent 427cb13249
commit 69c47c2544

@ -1 +1 @@
Subproject commit ca7ccbfa7785b8789d5222e4ab0bc74b5c71528b
Subproject commit fbc029e1316e2a7da12b0c1a2dae6fb89296931c