FIX: code comment
Merge pull request #643 from cvmfs/fix-mergeconflict

FIX: code comment