[criu/f19: 10/10] Merge branch 'f20' into f19

[Adrian Reber]

commit 45e2213243e22afbdabb8cd35cd5f331dc0d5a19
Merge: 84b371f fdad8cd
Author: Adrian Reber <adrian at lisas.de>
Date:   Sat Feb 8 22:47:29 2014 +0100

    Merge branch 'f20' into f19
    
    Conflicts:
    	criu.spec

 ...x-libcriu.so-links-and-man-page-installat.patch |   49 +++++++++++
 48b22f0d9578561660ae67c0cfdd66040362c9cf           |   54 +++++++++++++
 b0e6ebc1c7a529dfc3073c26f2a18733a1088458           |   84 ++++++++++++++++++++
 criu.spec                                          |   35 ++++++++-
 f5f9fb9c0007a613273064626b87ad62ad4b5923           |   40 +++++++++
 5 files changed, 260 insertions(+), 2 deletions(-)
---