tree 9baf7de146afaba06befafa78aba009cdb154605
parent 69b3b9fcf63d2bcee7cb2f4097e1770bd159d499
parent 43fcdbcac05a0cdc5c2a77c79c641849c41caa9e
author Andrey Andreev <narf@bofh.bg> 1325795010 +0200
committer Andrey Andreev <narf@bofh.bg> 1325795010 +0200

Merge upstream branch