Merge 'mwoe/master'
commit591e2e2852dacc0e613179534928176cdb598986
authorRiccardo Iaconelli <riccardo@kde.org>
Sat, 16 Feb 2008 12:37:36 +0000 (16 13:37 +0100)
committerRiccardo Iaconelli <riccardo@kde.org>
Sat, 16 Feb 2008 12:37:49 +0000 (16 13:37 +0100)
tree153e697fed8c3cd7b8bfb7384dd77bfd56e98437
parent609073f9c3c33f4a603c69b9f7e55361590d4895
parent55a96891e9f2e8269ca7376ad12e45dfb64d1677
Merge 'mwoe/master'