[gnome-applet-jalali-calendar/f13/master: 4/4] Merge branch 'master' into f13

[Hedayat Vatankhah]

commit 9d2108afc0c8903c6a0615ef1ee387d84840b875
Merge: 592992e 7191fdd
Author: Hedayat Vatankhah <hedayat at grad.com>
Date:   Fri Aug 6 01:34:31 2010 +0430

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	gnome-applet-jalali-calendar.spec
    	sources

 .gitignore                        |    2 +-
 gnome-applet-jalali-calendar.spec |    7 +++++--
 sources                           |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 43561bd,66e267b..e12e1ca
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--jalali-calendar-1.7.0.tar.bz2
+ jalali-calendar-1.7.1.tar.bz2