Fix for the sample label matching - this is only performed if the sample label is given.
Authored by: bugman 2011-02-07
Parent: [r12515]
Child: [r12517]