tree 9793ed402cdd9f4bc4d0ee2a9a01ad0d71fce35e
parent 0654403aaac9c642074529b319eba182d3dcdde0
parent 27c80af1dd9b871ab44452a8de22fd9cabaa184c
author Andrey Andreev <narf@bofh.bg> 1328136193 +0200
committer Andrey Andreev <narf@bofh.bg> 1328136193 +0200

Merge upstream