Merge branch 'master' of https://vcs.maemo.org/git/buliscores
authorDavid Solbach <d@vidsolbach.de>
Wed, 3 Nov 2010 11:25:29 +0000 (12:25 +0100)
committerDavid Solbach <d@vidsolbach.de>
Wed, 3 Nov 2010 11:25:29 +0000 (12:25 +0100)

Trivial merge