Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Wed, 23 Sep 2009 14:35:37 +0000 (16:35 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Wed, 23 Sep 2009 14:35:37 +0000 (16:35 +0200)

Trivial merge