Chris Cormack 77167b3b17 Merge remote branch 'kc/master' into new/enh/bug_5917 ... Conflicts: installer/data/mysql/updatedatabase.pl		2011-04-10 20:00:04 +12:00
..
prog	Merge remote branch 'kc/master' into new/enh/bug_5917	2011-04-10 20:00:04 +12:00