Merge commit '66890bb6803df8a553103a643523fe27db4c778a'
authorThomas Zander <zander@kde.org>
Thu, 12 May 2011 18:05:21 +0000 (20:05 +0200)
committerThomas Zander <zander@kde.org>
Thu, 12 May 2011 18:05:21 +0000 (20:05 +0200)
commit20aedbf622c134e31effb6f5bc7449e2a57f1587
tree73438daafd42ca75fdc69be6f9a11abb64da66b7
parent1c94317c3c526356c90f33116f53475d418da139
parent66890bb6803df8a553103a643523fe27db4c778a
Merge commit '66890bb6803df8a553103a643523fe27db4c778a'