Merge branch 'master' of ssh://drop.maemo.org/git/qwp
authoreduca33e <educa33e@gmail.com>
Tue, 1 Feb 2011 22:31:16 +0000 (23:31 +0100)
committereduca33e <educa33e@gmail.com>
Tue, 1 Feb 2011 22:31:16 +0000 (23:31 +0100)
commita4ed1ea7e44c4fa47c3c13db01e87e32aef42ed9
tree4ad6a9aaf4e11b34bc73fc46168542af1d4f8e51
parent1fc5f8537e186a31828a19eb3df62a0860aaa1f6
parent35062d3928ada7bfcb8f08201897545f91b7731b
Merge branch 'master' of ssh://drop.maemo.org/git/qwp

Conflicts:
qml/qwp/content/Config.qml
qtc_packaging/debian_fremantle/changelog
qtc_packaging/debian_fremantle/control
qwp.pro.user
qml/qwp/content/Config.qml
qtc_packaging/debian_fremantle/changelog
qtc_packaging/debian_fremantle/control