Fixes #4 for 1.6-2.5
Merge remote-tracking branch 'vuvvn/joomla_1_6_to_2_5' into rokecwid_j16_j25