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

[Than Ngo]

commit 4f93d92d2fa4c2773e81c4d449f003a2de304319
Merge: 206767e 982048a
Author: Than Ngo <than at redhat.com>
Date:   Fri May 6 11:43:16 2011 +0200

    Merge branch 'master' into f14

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