[gnome-sharp/f19: 3/3] fix merge

[Peter Robinson]

commit 92ab74000190e574fde33642c606426f854ccf5c
Merge: 8549f6d 2cd37de
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Apr 1 09:51:09 2013 +0100

    fix merge

 .gitignore       |    1 +
 gnome-sharp.spec |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
---