[mfiler3: 12/12] Ensure all changes in F13 are also in F14.

[Adam Tkac]

commit 045230a0f71327cc35c93542f953ffd2a32104d8
Merge: 3802943 dc448ea
Author: Adam Tkac <atkac at redhat.com>
Date:   Tue Aug 24 10:56:50 2010 +0200

    Ensure all changes in F13 are also in F14.
    
    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore
    	mfiler3.spec
    	sources
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 .gitignore   |    2 +-
 mfiler3.spec |   25 ++++++++++++++++---------
 sources      |    2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)
---