[gambas2/f17: 4/4] fix merge

[Peter Robinson]

commit f071f004e7265c5416d28a887452912638d133ff
Merge: d47143d 69fd946
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Apr 28 08:44:45 2012 +0100

    fix merge

 gambas2.spec |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)
---