[gnote/f13/master: 7/7] Merge branch 'master' into f13

[Rahul Sundaram]

commit c73d6ec767434099752a176c35659c0d8f5dfeb7
Merge: 3e7d45a 3b61878
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Sat Nov 6 05:30:19 2010 +0530

    Merge branch 'master' into f13

 gnote-replace-dep-macros.patch |   40 ----------------------------------------
 gnote.spec                     |   26 +++++++++++++++-----------
 sources                        |    2 +-
 3 files changed, 16 insertions(+), 52 deletions(-)
---