merge from trunk (58852-58891)

[SVN r58984]
This commit is contained in:
Matias Capeletto 2010-01-13 19:04:08 +00:00
parent a4675c4da4
commit 63652d8ce8

@ -1 +1 @@
Subproject commit 60dab6da41bdb4b2cc4306cb87572783aeedfb21
Subproject commit 78c68703b33aaf560ede1970b30bec04dc18eea5