tree aa9d105f7c94d513b27f5931b121641409c0b91a
parent b6c7ec262523dc1ddb618c6aaa11c20fe833ba0f
parent c016a1102e2a77e0c27b9656c19a0460df24dfb6
author Andrey Andreev <narf@bofh.bg> 1331296149 +0200
committer Andrey Andreev <narf@bofh.bg> 1331296149 +0200

Merge upstream branch