Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 25 Dec 2009 17:52:36 +0000 (18:52 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 25 Dec 2009 17:52:36 +0000 (18:52 +0100)

Trivial merge