Merge branch 'master' of https://vcs.maemo.org/git/presencevnc
authorChristian Pulvermacher <christian@christian-laptop.(none)>
Thu, 28 Oct 2010 09:37:59 +0000 (11:37 +0200)
committerChristian Pulvermacher <christian@christian-laptop.(none)>
Thu, 28 Oct 2010 09:37:59 +0000 (11:37 +0200)

Trivial merge