merged rev. 48728 from trunk

[SVN r48774]
This commit is contained in:
Joaquín M López Muñoz 2008-09-14 16:36:06 +00:00
parent 4445d97559
commit fca9ab29a4

@ -1 +1 @@
Subproject commit df5eb5b646bd100fe4717277675c326c5fea2689
Subproject commit 8c5ac57c6a352876e37cdff8ae1b8ec1da87e2cd