[MERGE] [Bug #220545] Read '/etc/colordiffrc' before '~/.colordiffrc'.

[Aaron Bentley]

Aaron Bentley has voted approve.
Status is now: Semi-approved
Comment:
Sure.  I'll merge it.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C20080710.123306.673467711932121230.Christophe.Troestler%2Bbzr%40umh.ac.be%3E