tree a9dc48c0b919e9f86a3ad8cc1c26d40102d16e47
parent 7fd137b9cb3aa8477e92ecce434ac61e904527c2
parent 9252d7bf2208d351aad4292cb79c509391f0313f
author Andrey Andreev <narf@bofh.bg> 1325891913 +0200
committer Andrey Andreev <narf@bofh.bg> 1325891913 +0200

Merge upstream branch