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

[Peter Lemenkov]

commit e0b78223de95894317bca00a502dd3ddb7bbe8be
Merge: 780ac16 9d6db9a
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Jun 7 15:33:43 2011 +0400

    Merge branch 'master' into el5

 sources          |    2 +-
 superiotool.spec |   22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)
---