tree f6a2b5b5c8fd65d4958ca08010e2a4927028a5f1
parent c68905a85983a5bd1e85f778c5c0df2f680425d5
parent 0209c70195384308f06a6c0fc42693c1c649cf46
author Andrey Andreev <narf@bofh.bg> 1328736925 +0200
committer Andrey Andreev <narf@bofh.bg> 1328736925 +0200

Merge upstream branch