[kdeplasma-addons/f14: 2/2] Merge branch 'f15' into f14

[Than Ngo]

commit 16de9c8cfa1ff1d96739c92a2d3cedcaa49991f7
Merge: 4f93d92 d335972
Author: Than Ngo <than at redhat.com>
Date:   Thu Jun 9 16:24:12 2011 +0200

    Merge branch 'f15' into f14

 kdeplasma-addons.spec |    5 ++++-
 sources               |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---