[Rivet] trunk and aida branch in sync again

[Hendrik Hoeth]

FYI:

I've just finished syncing the AIDA-branch and trunk again. Revision
r3917 is up-to-date in both directories.

-- 
Journalist: "Can you explain 5 sigma as 99.999something percent?"
Fabiola G.: "Sure, that's 3*10^-7."
(after the CERN Higgs seminar, 4 July 2012)