[gnome-applet-alarm-clock/f13/master: 4/4] Merge branch 'master' into f13

[Christoph Wickert]

commit ba62601833f4fe66c2269534087c154b0db434f2
Merge: 4d26939 7c4b8b1
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Fri May 6 10:56:44 2011 +0200

    Merge branch 'master' into f13

 .gitignore                                         |    1 +
 ...alarm-clock-0.3.1-create-config-autostart.patch |   32 --------------------
 gnome-applet-alarm-clock.spec                      |   17 +++++++---
 sources                                            |    2 +-
 4 files changed, 14 insertions(+), 38 deletions(-)
---