[iok: 5/5] Merge changes in F13 branch into devel and F14.

[Adam Tkac]

commit 02b666bcc5ae75a46a671aeeace6a79493c1de10
Merge: 4fd440e 827cd44
Author: Adam Tkac <atkac at redhat.com>
Date:   Fri Aug 20 17:10:14 2010 +0200

    Merge changes in F13 branch into devel and F14.
    
    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore
    	iok.spec
    	sources
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 .gitignore |    2 +-
 iok.spec   |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---