Merge branch 'master' of ../mmc
authorPierre Ossman <drzeus@drzeus.cx>
Wed, 31 Dec 2008 18:56:05 +0000 (19:56 +0100)
committerPierre Ossman <drzeus@drzeus.cx>
Wed, 31 Dec 2008 18:56:05 +0000 (19:56 +0100)

Trivial merge