Fixed a bug introduced in r9996.
The mf_minimise module conflicts were not properly resolved. This should now work better.
Authored by: bugman 2009-11-27
Parent: [r9996]
Child: [r9998]
