[kdeplasma-addons/f16] (7 commits) ...Merge remote-tracking branch 'origin/master' into f16

[Rex Dieter]

Summary of changes:

  6c3fc54... Fix crash with Group Desktop plasma option (*)
  127ba54... * Sun Aug 21 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7 (*)
  4b0ab1a... * Sun Aug 21 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7 (*)
  4436fdb... 4.7.1 (*)
  8c2effa... BR: marble-devel (*)
  8e9f3b3... marble epoch 1 (*)
  6934e97... Merge remote-tracking branch 'origin/master' into f16

(*) This commit already existed in another branch; no separate mail sent