Merge branch 'mika/release_0.14.1' v0.14.1
authorMichael Prokop <mika@grml.org>
Sun, 29 May 2011 10:11:13 +0000 (12:11 +0200)
committerMichael Prokop <mika@grml.org>
Sun, 29 May 2011 10:11:13 +0000 (12:11 +0200)

Trivial merge