Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Wed, 7 Oct 2009 18:09:18 +0000 (20:09 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Wed, 7 Oct 2009 18:09:18 +0000 (20:09 +0200)

Trivial merge