tree 94419ba1168081481aa2e1400e48a389262ecdc3
parent e2b8f67cd5c7290d0bab46bdaea1164c5fe5127f
parent c016a1102e2a77e0c27b9656c19a0460df24dfb6
author Andrey Andreev <narf@bofh.bg> 1331297071 +0200
committer Andrey Andreev <narf@bofh.bg> 1331297071 +0200

Merge upstream branch