[tomboy/f14: 2/2] Merge branch 'master' into f14

[Thomas Moschny]

commit 879c14b83026290a2149e02abe5bef9a678b77c8
Merge: aaa9545 3caabfb
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Jun 16 02:13:13 2011 +0200

    Merge branch 'master' into f14

 .gitignore                    |    1 +
 sources                       |    2 +-
 tomboy-1.7.0-ndesk-dbus.patch |  152 +++++++++++++++++++++++++++++++++++++++++
 tomboy.spec                   |   22 ++++--
 4 files changed, 168 insertions(+), 9 deletions(-)
---