tree cfeb947c7f2f725981634f9efb2baa30e31ecdde
parent d9e823f376d7829dec9dfb4366166e67a707d8d7
parent 827a92a6965612b185ae2e6766b6fb7740cd0cc2
author Andrey Andreev <narf@bofh.bg> 1329385411 +0200
committer Andrey Andreev <narf@bofh.bg> 1329385411 +0200

Merge upstream branch