[clac/f14/master: 3/3] Merge branch 'master' into f14

[Manuel Wolfshant]

commit 1f89097999e1772a0286b65724d2bd3787db3b7b
Merge: d3da5e5 2fe4046
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date:   Mon Aug 23 10:14:21 2010 +0300

    Merge branch 'master' into f14

 clac.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---