[crontabs/f13/master: 6/6] Merge branch 'master' into f13

[Marcela Mašláňová]

commit 21884b4dee8bf46ad39f095365101688da264148
Merge: ab4f3dd a49aff4
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Tue Nov 2 13:26:04 2010 +0100

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore    |    7 +++----
 crontab       |   16 ----------------
 crontabs.spec |   34 ++++++++++++++++++++++------------
 run-parts     |   53 -----------------------------------------------------
 sources       |    4 +---
 5 files changed, 26 insertions(+), 88 deletions(-)
---