[sugar-browse/f17: 3/3] fix merge

[Peter Robinson]

commit d45011158160b89f9d7629b0a9608f47012a26c9
Merge: ef17c73 83f901e
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Mar 24 00:36:58 2012 +0000

    fix merge

 .gitignore        |    7 +------
 sources           |    2 +-
 sugar-browse.spec |    5 ++++-
 3 files changed, 6 insertions(+), 8 deletions(-)
---