[kdebase-workspace/f14/master: 2/2] Merge branch 'master' into f14

[Rex Dieter]

commit 4649438dbd587da980b557b00e5c4ce4a6a7fd2f
Merge: a0303d0 ffadad9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 15:38:12 2010 -0500

    Merge branch 'master' into f14

 ...ase-workspace-4.5.1-kfontview_dt_validate.patch |   12 ++++++++++++
 kdebase-workspace.spec                             |   11 +++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
---