[fetch-crl/el6/master: 2/2] Merge branch 'master' into el6

[stevetraylen]

commit 4305882c5205b3aacee3d123c1b584a2da02eb78
Merge: a584118 65f8163
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Thu Oct 14 11:04:17 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	fetch-crl.spec

 .gitignore     |    1 +
 fetch-crl.spec |    8 ++++----
 sources        |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---