tree 22cd130b389912376f00a3bd3128f56224d4687e
parent 60138567c58dd924e2240973e34f0e3903a7ef2b
parent e5617335b5130718c43e5072ad003f677619d332
author Andrey Andreev <narf@bofh.bg> 1331634217 +0200
committer Andrey Andreev <narf@bofh.bg> 1331634217 +0200

Merge upstream branch