Merge commit 'flameeyes/master'
authorLennart Poettering <lennart@poettering.net>
Mon, 10 Aug 2009 19:33:42 +0000 (21:33 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 10 Aug 2009 19:33:42 +0000 (21:33 +0200)
commitd8d26979facaf4b3603e795b2320811daa7ac263
tree3eab62c3f8382a23bfd26c7121a1459e9c665160
parent23a294c97e62e0bee9b17b1f8ad20a39e1ba15da
parent10e4171265381f250c7f243d566b4c0b937b86e1
Merge commit 'flameeyes/master'