For UMS devices, add device (in brackets) after name. Should help devices with multiple partitions.
BUG: 413


git-svn-id: http://cantata.googlecode.com/svn/trunk@4126 b1e49159-3266-923f-9c3e-04f16369770a