tree 2497c63c3252b1ace676c07585f32611b84cb16d
parent 8e160e471259ad01c0e994e7ce5797c2a51afd7a
parent 918be7963f6fa3461d612ea7ca4c9774c12f9da5
author Andrey Andreev <narf@bofh.bg> 1333978310 +0300
committer Andrey Andreev <narf@bofh.bg> 1333978310 +0300

Merge upstream branch