tree 2986fca0191318f3bcff379fb7d464814a83843a
parent 8bbb38983b8052e32063244941315fe81199e024
parent 002b4be248e448227a718e6f7d9ee39ccc575745
author Andrey Andreev <narf@bofh.bg> 1330519467 +0200
committer Andrey Andreev <narf@bofh.bg> 1330519467 +0200

Merge upstream branch