1) correct FileMode.merge() to check the values of the FileMode that is    merged, not self 2) in FileMode.isConfig(), if theFlags hasn't been set yet, initialize it.
1) correct FileMode.merge() to check the values of the FileMode that is
   merged, not self
2) in FileMode.isConfig(), if theFlags hasn't been set yet, initialize it.

sassoftware/conary,sassoftware/conary,sassoftware/conary,sassoftware/conary,sassoftware/conary