[telepathy-mission-control/f14/master: 4/4] fix merge with master

[Peter Robinson]

commit 1c95089c54355ae3769847d888239a519349ee90
Merge: d086855 0658fea
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Nov 17 22:44:27 2010 +0000

    fix merge with master

 .gitignore                     |    1 +
 sources                        |    2 +-
 telepathy-mission-control.spec |   13 ++++++++-----
 3 files changed, 10 insertions(+), 6 deletions(-)
---