tree 125069e2089d0e0ee3b8337b7acac6050ca1e045
parent 4b4363871256df9009bb4245def8f89420331cfd
parent 8480f7c35af9aacaf2ebee43677ff1d31a5cce13
author Andrey Andreev <narf@bofh.bg> 1332255544 +0200
committer Andrey Andreev <narf@bofh.bg> 1332255544 +0200

Merge upstream branch