commit 65c5cad685d27c90b11e1b51500fad9611c943e8
branch master
Merge: d4ee31c ab63a37
Author: Laszlo Papp <djszapi@archlinux.us>
Date:   Sun Jan 16 16:12:57 2011 -0800

    Merge branch 'master' of ssh://git.kde.org/gluon