Merge branch 'master' of https://vcs.maemo.org/git/buliscores
authorDavid Solbach <d@vidsolbach.de>
Wed, 3 Nov 2010 13:22:19 +0000 (14:22 +0100)
committerDavid Solbach <d@vidsolbach.de>
Wed, 3 Nov 2010 13:22:19 +0000 (14:22 +0100)
Conflicts:
src/src.pro


Trivial merge