[tomboy/autosync: 235/241] Merge branch 'faster' into autosync

[Sanford Armstrong <sharm src gnome org>]

commit 30d15cc9ce3fc422cc34d61fdeb3b934ffe25c2c
Merge: 0dabee1 13714e3
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date:   Mon Jan 25 00:25:30 2010 -0800

    Merge branch 'faster' into autosync

 Tomboy-mac.csproj                                  |    5 +-
 Tomboy.csproj                                      |    5 +-
 Tomboy/Addins/Backlinks/Backlinks-mac.csproj       |    8 +-
 Tomboy/Addins/Bugzilla/Bugzilla-mac.csproj         |    8 +-
 Tomboy/Addins/ExportToHtml/ExportToHtml-mac.csproj |    4 +-
 .../FileSystemSyncService-mac.csproj               |    8 +-
 Tomboy/Addins/FixedWidth/FixedWidth-mac.csproj     |    8 +-
 .../InsertTimestamp/InsertTimestamp-mac.csproj     |    8 +-
 .../NoteDirectoryWatcher-mac.csproj                |    8 +-
 Tomboy/Addins/NoteOfTheDay/NoteOfTheDay-mac.csproj |    8 +-
 Tomboy/Addins/PrintNotes/PrintNotes-mac.csproj     |    6 +-
 Tomboy/Addins/Underline/Underline-mac.csproj       |    8 +-
 Tomboy/Applet.cs                                   |   37 +++++++----
 Tomboy/NoteManager.cs                              |   65 ++++++++++++++++----
 Tomboy/PrefsKeybinder.cs                           |   22 ++++---
 Tomboy/RemoteControlProxy.cs                       |   11 ++--
 Tomboy/Tomboy.cs                                   |   61 +++++++++---------
 Tomboy/Tray.cs                                     |   16 +++---
 Tomboy/tomboy.in                                   |    2 -
 19 files changed, 178 insertions(+), 120 deletions(-)
---