tree 9e1ecf158787f934e9df1e925dc402aa865e792a
parent a1cb9902897ed717dba238daf4c84d539f47a474
parent 9a1fc2013e876347e9c8d336bade7ac589712bf7
author Andrey Andreev <narf@bofh.bg> 1332754821 +0300
committer Andrey Andreev <narf@bofh.bg> 1332754821 +0300

Merge upstream branch