[superiotool/f12/master: 7/7] Merge branch 'master' into f12/master

[Peter Lemenkov]

commit 708cf73b0b4c3dc3d8a00600c74af14e761876ac
Merge: 60740fc 68d65ee
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Aug 16 18:05:58 2010 +0400

    Merge branch 'master' into f12/master
    
    Conflicts:
    	sources
    	superiotool.spec

 sources                                            |    2 +-
 ...iff => superiotool-0001-Makefile-cleanups.patch |   27 ++++++++++++++-----
 superiotool.spec                                   |   14 +++++++---
 3 files changed, 31 insertions(+), 12 deletions(-)
---