Merge branch 'master' of ssh://rootserver/home/lennart/git/public/libatasmart
authorLennart Poettering <lennart@poettering.net>
Fri, 10 Apr 2009 03:21:15 +0000 (05:21 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 10 Apr 2009 03:21:15 +0000 (05:21 +0200)

Trivial merge