tree 19b1d7b1d8ca0b5fdefd8298cdb58b7657d22dc9
parent 041f1e526a186a729a5cb3c62a0581723056b851
parent a19beb0c580ac78c4b75548a046240a85f30cb29
author Andrey Andreev <narf@bofh.bg> 1330742224 +0200
committer Andrey Andreev <narf@bofh.bg> 1330742224 +0200

Merge upstream branch