tree 3c11a9b327184863654f3825756fd9a6ebe1af44
parent 74496c268ae7199082cad86e0fea65687d78a2c9
parent 8af76666474c42b45518c08bec16b4f8d700dd3c
author Andrey Andreev <narf@bofh.bg> 1330950913 +0200
committer Andrey Andreev <narf@bofh.bg> 1330950913 +0200

Merge upstream branch