Chrono:Fix bad merge

[SVN r74835]
This commit is contained in:
Vicente J. Botet Escriba 2011-10-09 01:10:03 +00:00
parent cb9aa8cdac
commit b1b3bf84b2

@ -1 +1 @@
Subproject commit 6db7aba17ed52033b518441d48a3f6547964f5dd
Subproject commit 091a7ef251c40b6c15d5ae914ff33ffb329389c7