[wicd-kde/f17: 3/3] fix merge

[Peter Robinson]

commit 50922c61990fa8841820a908a45c11e70d94abf0
Merge: dd22df0 ed26739
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Apr 4 19:24:10 2012 +0100

    fix merge

 fix-qmax-call.patch |   24 ++++++++++++++++++++++++
 wicd-kde.spec       |   18 ++++++++++--------
 2 files changed, 34 insertions(+), 8 deletions(-)
---