[util-linux/f19: 3/3] Merge branch 'master' into f19

[kzak]

commit d2b0e417cfe93b7f5b9da73ef30f0698a8092238
Merge: 19ed00a 506ce79
Author: Karel Zak <kzak at redhat.com>
Date:   Thu Apr 25 13:26:38 2013 +0200

    Merge branch 'master' into f19

 .gitignore                                         |    1 +
 ...x-mount.nfs-segfault-rely-on-assert-rathe.patch | 1340 --------------------
 sources                                            |    2 +-
 util-linux.spec                                    |   23 +-
 4 files changed, 19 insertions(+), 1347 deletions(-)
---