[openscada/f16: 3/3] fix merge

[Peter Robinson]

commit f346c238673c6d6eac0ae9805d73fcdb38558b9d
Merge: ca6dfb6 dd91b6d
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Oct 11 15:13:12 2011 +0100

    fix merge

 openscada.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---