* Partially reverted r16076. The 2 loops wasn't unnecessary, they use different match strategy.
* Partially reverted r16076. The 2 loops wasn't unnecessary, they use different match strategy.

git-svn-id: c1e39603916b71782cde5facdf0b79eff05c1414@16078 54d463be-8e91-2dee-dedb-b68131a5f0ec

Nipol/Siesta,Nipol/Siesta,Nipol/Siesta