Merge commit 'flameeyes/master'
authorLennart Poettering <lennart@poettering.net>
Wed, 27 May 2009 21:57:50 +0000 (23:57 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 27 May 2009 21:57:50 +0000 (23:57 +0200)
commit6044aabf586d45a1ed0d6f7b9c7ed5e46df275d2
tree4164fbc6341dd06b96c5fc01b93a5531f6b6408e
parent208862698e8ebf6bebfd9a07e4cc4b43b3cd0d96
parentce6643e8c9bbfb466721985bc777fb47c1b26267
Merge commit 'flameeyes/master'