tree 31ccf7c81a68b63a33156f649219fe5caf6dcb5b
parent a0c2785f91bc70fb4a0a02f1c9c28cb99c975457
parent bcb3bbb97c8c046f80009a2bd8dffb96795ed239
author Andrey Andreev <narf@bofh.bg> 1330689471 +0200
committer Andrey Andreev <narf@bofh.bg> 1330689471 +0200

Merge upstream branch