Merge branch 'master' into p-u

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>

britney.conf

@@ -39,7 +39,6 @@ HINTS_VORLON      = ALL
 HINTS_ABA         = ALL
 HINTS_HE          = ALL
 HINTS_LUK         = ALL
-HINTS_ZOBEL       = STANDARD force
 HINTS_PKERN       = STANDARD force
 HINTS_NEILM       = STANDARD
 HINTS_FREEZE      = block block-all block-udeb

britney.py

@@ -1865,7 +1865,8 @@ class Britney:
                 # the package didn't exist, so we mark it as to-be-removed in case of undo
                 undo['sources']['-' + item.package] = True
 
-        # single binary removal
+        # single binary removal; used for clearing up after smooth
+        # updates but not supported as a manual hint
         elif item.package in binaries[item.architecture][0]:
             undo['binaries'][item.package + "/" + item.architecture] = binaries[item.architecture][0][item.package]
             affected.extend( [ (x, item.architecture) for x in \