Merge branch 'tarballs' into release
authorMichael Tänzer <neo@nhng.de>
Mon, 11 Apr 2011 18:15:06 +0000 (20:15 +0200)
committerMichael Tänzer <neo@nhng.de>
Mon, 11 Apr 2011 18:15:06 +0000 (20:15 +0200)
Conflicts:
password.dat.sample

Signed-off-by: Michael Tänzer <neo@nhng.de>

Trivial merge