[kdepimlibs/f14/master: 4/4] Merge remote branch 'origin/master' into f14/master

[Rex Dieter]

commit 282501677496ca9377b7276b185bd0db9525d6b2
Merge: 4fa13a0 4dd3405
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 23 08:43:42 2010 -0500

    Merge remote branch 'origin/master' into f14/master
    
    Conflicts:
    	kdepimlibs.spec

 kdepimlibs.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---