Merge commit 'coling/master'
authorLennart Poettering <lennart@poettering.net>
Mon, 30 Mar 2009 17:15:39 +0000 (19:15 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 30 Mar 2009 17:15:39 +0000 (19:15 +0200)
commit1743322d3e184d57a80cd58e9bcfb0bf01bd4c67
tree4f9315ff43c6b3767ca6cf128b3066014cdb062e
parent061344fbd78f4a643f4e2a12b24c5d1ae1622e04
parent205cbe8afcf83ac7392b90ba8c73f40b798104c6
Merge commit 'coling/master'