Merge branch 'master' of ssh://rootserver/home/lennart/git/public/libflashsupport
authorLennart Poettering <lennart@poettering.net>
Thu, 27 Sep 2007 19:47:01 +0000 (27 21:47 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 27 Sep 2007 19:47:01 +0000 (27 21:47 +0200)

Trivial merge