[telepathy-gabble/f16: 2/2] Merge branch 'master' into f16

[Brian Pepple]

commit 3a3a65ebd8d6182f6650bba028c713ad491061ea
Merge: b549356 aa6957b
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Wed Nov 16 11:06:39 2011 -0500

    Merge branch 'master' into f16

 .gitignore            |    1 +
 sources               |    2 +-
 telepathy-gabble.spec |    7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)
---