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

[Jaroslav Reznik]

commit 46a698a9229c4624f3b4d78cb17c0d271942753e
Merge: 16de9c8 0167c21
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Fri Jul 1 18:06:01 2011 +0200

    Merge remote-tracking branch 'origin/f15' into f14

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