Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Wed, 23 Dec 2009 10:19:24 +0000 (11:19 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Wed, 23 Dec 2009 10:19:24 +0000 (11:19 +0100)

Trivial merge