[superiotool/el5/master: 25/25] Merge branch 'master' into el5/master

[Peter Lemenkov]

commit af8bdad93aef87d2342a90a2900c48b649d5399c
Merge: 2f93ff5 68d65ee
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Aug 16 18:31:58 2010 +0400

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

 sources                                  |    2 +-
 superiotool-0001-Makefile-cleanups.patch |   46 ++++++++++++++++++++++++++++++
 superiotool.spec                         |   14 ++++++--
 3 files changed, 57 insertions(+), 5 deletions(-)
---