tree 65eb1e39cfd3d979840a079a157d696070f1c0c1
parent 85facfa42793cce480d2f49696c2d3e3096763f0
parent 0c4fb6a578d23e5a0fa5c8ce41a75d2b2b1310e7
author Andrey Andreev <narf@bofh.bg> 1327692110 +0200
committer Andrey Andreev <narf@bofh.bg> 1327692110 +0200

Merge upstream branch