[util-linux-ng/f14/master: 4/4] Merge branch 'master' into f14

[kzak]

commit 79fe500e3a2440786016e11c7a8ecf04472f22f4
Merge: 49e94c6 f5753f2
Author: Karel Zak <kzak at redhat.com>
Date:   Thu Aug 5 11:59:36 2010 +0200

    Merge branch 'master' into f14
    
    Signed-off-by: Karel Zak <kzak at redhat.com>

 mount.tmpfs        |    4 +---
 util-linux-ng.spec |    5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)
---