[sugar-record/f14: 6/6] fix merge

[Peter Robinson]

commit 4912da62fca81eb0d1fc77860af8defb82da4663
Merge: da36d3f 4abcd82
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat May 21 12:34:46 2011 +0100

    fix merge

 .gitignore        |    3 +++
 launch            |    4 ----
 sources           |    2 +-
 sugar-record.spec |   39 +++++++++++++++------------------------
 4 files changed, 19 insertions(+), 29 deletions(-)
---