Merge commit 'coling/master'
authorLennart Poettering <lennart@poettering.net>
Tue, 27 Jan 2009 23:25:50 +0000 (00:25 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 27 Jan 2009 23:25:50 +0000 (00:25 +0100)
commit611154caca20fc6b3c4240bf3e9c7e78cc403327
treec120fcccc9e8a0d3cc4ba4a28764b05e1e20c8fb
parent3affa7e02deae2d61cacb59dcdd4c2f0846ef9dc
parent6e31178fd9cff2377eb1c6943d4c4d7b808b37d6
Merge commit 'coling/master'