Fix issues with other merges

This commit is contained in:
Tim Bentley 2010-09-22 06:03:10 +01:00
parent 5e38d34997
commit 47b359a313