Added by Luca Abeni about 10 years ago
Merge branch 'merge-csaba'
Conflicts: input-dummy.c loop-mt.c