b79033
- Finish up with the merge breakage. - Temporary fix for the multimount detection code. It seems half-baked.