Backporting r657500

[Mladen Turk]

Any problems I backport the
http://svn.apache.org/viewvc?rev=657500&view=rev
to 1.2 and 1.3 ?


Regards
--
^(TM)