svn merge -r 11123:11125 branches/locate_components/ trunk/
Ricardo SIGNES [Tue, 11 Aug 2009 23:33:18 +0000 (23:33 +0000)]

Trivial merge