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

[Mads Villadsen]

commit 7a9c5cac0cb29126b964132a9bb1775909835987
Merge: cf5b121 d797092
Author: Mads Villadsen <maxx at krakoa.dk>
Date:   Tue Sep 28 23:06:48 2010 +0200

    Merge branch 'master' into f13

 .gitignore                  |    1 +
 gnome-activity-journal.spec |   12 +++++++-----
 sources                     |    2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 5b9f91e,73cae53..9f10ef2
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -gnome-activity-journal-0.3.4.1-bzr1010.tar.gz
  /gnome-activity-journal-0.5.0.tar.gz
+ /gnome-activity-journal-0.5.0.1.tar.gz