merged branches

[Frederik Gladhorn]

Ok, I thought I did that already at the airport but somehow I didn't push 
everything, so here you have an up to date screenshot.
I even went through the trouble of searching for k3b this time (instead of 
some random scam ;)

Cheers,
Frederik
-------------- next part --------------
A non-text attachment was scrubbed...
Name: current-app-thingy1.png
Type: image/png
Size: 207676 bytes
Desc: not available
Url : http://mail.kde.org/pipermail/kde-bretzn/attachments/20110126/6bc1184e/attachment-0001.png 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-bretzn/attachments/20110126/6bc1184e/attachment-0001.sig