tree a9ff09cc958980aa04bc86435446bdc0cba58360
parent 4540845523019c6fcbc9646fa8eb1361fc9f79c3
parent 0209c70195384308f06a6c0fc42693c1c649cf46
author Andrey Andreev <narf@bofh.bg> 1328737536 +0200
committer Andrey Andreev <narf@bofh.bg> 1328737536 +0200

Merge upstream branch