[gnome-shell: 7/8] Merge remote-tracking branch 'origin/f17'

[Kalev Lember]

commit 58016b9f200d6029d6cb7aa200ae013fcf8c94cd
Merge: cd83cf5 9d5ea85
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Mar 21 12:07:36 2012 +0200

    Merge remote-tracking branch 'origin/f17'

 .gitignore       |    2 ++
 gnome-shell.spec |   19 +++++++++++++++++--
 sources          |    2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)
---