tree 8577760040339acc588edd41e8f4dab653385da7
parent fb61aabd33607479bcfcaf7881bfd8fcf813d1a5
parent d153002858256c6f206c8877f4952ed075902f9e
author Andrey Andreev <narf@bofh.bg> 1331636024 +0200
committer Andrey Andreev <narf@bofh.bg> 1331636024 +0200

Merge upstream branch