[gnome-activity-journal/f13/master: 7/7] Merge branch 'master' into f13

[Mads Villadsen]

commit cf5b121b7144489ddd6279155b4ea9e712132307
Merge: 16888e9 6b915ee
Author: Mads Villadsen <maxx at krakoa.dk>
Date:   Tue Aug 24 21:35:07 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	gnome-activity-journal.spec
    	sources

 .gitignore                                         |    2 +-
 ...ournal-0.5.0-zeitgeist-version-workaround.patch |   12 ++++++++
 gnome-activity-journal.spec                        |   28 ++++++++++++-------
 sources                                            |    2 +-
 4 files changed, 32 insertions(+), 12 deletions(-)
---
diff --cc .gitignore
index 9235ee6,eedc5db..5b9f91e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--gnome-activity-journal-0.3.4.1-bzr1010.tar.gz
+ /gnome-activity-journal-0.5.0.tar.gz