[sugar-presence-service/f14/master: 2/2] Merge branch 'master' into f14

[Peter Robinson]

commit 7bdec2128a9e45470d9ba053900699bb269c3dd1
Merge: 7e78ec5 5972716
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Aug 25 22:48:48 2010 +0100

    Merge branch 'master' into f14

 .gitignore                  |    1 +
 sources                     |    2 +-
 sugar-presence-service.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---