tree 3fe27cadde3135dd1175637a60c6588db2083f94
parent d9c592b04f129fa01b72e3a0953fd48e85c18f2d
parent 827a92a6965612b185ae2e6766b6fb7740cd0cc2
author Andrey Andreev <narf@bofh.bg> 1329385653 +0200
committer Andrey Andreev <narf@bofh.bg> 1329385653 +0200

Merge upstream branch