Merge branch 'master' into cmd_unset
authorWolfgang (Blub) Bumiller <blub@speed.at>
Thu, 28 Jan 2010 10:22:07 +0000 (11:22 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Thu, 28 Jan 2010 10:22:07 +0000 (11:22 +0100)

Trivial merge