[SCM] mapserver branch, master, updated. upstream/6.0.1-38-g726c38d

[Jerome Villeneuve Larouche]

The following commit has been merged in the master branch:
commit 79fbd33961d1216263e4526984a4a525ad57d963
Merge: 42429ebc0b3a7bb0c677b70a6874d8d0cda4ab0b a274d9ca4594f0b8184cd3f5a007ab83d6dee285
Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
Date:   Thu Nov 15 13:37:40 2012 +0000

    Merge commit 'upstream/6.2.0'


-- 
Mapserver