tree 55c547a55b349e83db32a357a48040769027fd32
parent 5f2214f0526b823c92f308312d883147a4c9faed
parent 55201acd0692f02eb5927f412db73b925b6ba738
author Andrey Andreev <narf@bofh.bg> 1332246190 +0200
committer Andrey Andreev <narf@bofh.bg> 1332246190 +0200

Merge upstream branch