Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Mon, 21 Dec 2009 17:26:59 +0000 (18:26 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Mon, 21 Dec 2009 17:26:59 +0000 (18:26 +0100)

Trivial merge