[ekiga/f16: 8/8] fix merge

[Peter Robinson]

commit 864afd74b84f12d7b612666e2d9fafc835d406c5
Merge: d019714 02dc1c0
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Sep 5 23:30:05 2011 +0100

    fix merge

 .gitignore          |    1 +
 ekiga-fixdso.patch  |   11 ------
 ekiga-gettext.patch |   25 -------------
 ekiga.spec          |  101 +++++++++++++++++++++++++--------------------------
 sources             |    2 +-
 5 files changed, 51 insertions(+), 89 deletions(-)
---