Merge branch 'master' of https://vcs.maemo.org/git/buliscores
authorDavid Solbach <d@vidsolbach.de>
Sun, 14 Nov 2010 19:41:46 +0000 (20:41 +0100)
committerDavid Solbach <d@vidsolbach.de>
Sun, 14 Nov 2010 19:41:46 +0000 (20:41 +0100)

Trivial merge