Merge multipath branch from ix repo with a few tweaks
Authored by: zippybr 2012-01-26
Parent: [r9832]
Child: [r9834]