tree 634afccfaa9a23bb4b0ab437766d84334c847763
parent 0622b6d1e50da7dd60d8cbeccff6e5f9c8a1bf03
parent 963386ba6072d240840b58d6dbe54287edcb04ad
author Andrey Andreev <narf@bofh.bg> 1330646261 +0200
committer Andrey Andreev <narf@bofh.bg> 1330646261 +0200

Merge upstream branch