Merge branch 'master' of git+ssh://git.gnome.org/git/sysprof
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>
Sun, 22 Feb 2009 16:13:26 +0000 (11:13 -0500)
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>
Sun, 22 Feb 2009 16:13:26 +0000 (11:13 -0500)

Trivial merge