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

[stevetraylen]

commit 50645a082ebc21642d0b0022cac88bc6840a0408
Merge: 2ed632b c5ac335
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Sun Mar 20 13:48:20 2011 +0100

    Merge branch 'master' into el6

 .gitignore |    1 +
 sources    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
---