tree 3f0098f4f8b65ff61d60a333351d847387670596
parent 5e18e891a14400a96f9b4af36925457b79b62005
parent 6ea625e7f31b65838f1829408d37ac26009c79bc
author Andrey Andreev <narf@bofh.bg> 1332247796 +0200
committer Andrey Andreev <narf@bofh.bg> 1332247796 +0200

Merge upstream branch