Merge branch 'master' into contents

* master:
  Add back the update_subst call
  i think i fixed sort_changes
  fix the way we move files
  it at least gets to examine_package now
  attempt to fix process_new
  don't be too lax with our LIKE match
  p-n
  p-n
  p-n
  p-n

diff --cc daklib/dbconn.py
Simple merge