tree fe062a9f4004f60fd120275953efee035f6c15a0
parent 5d391521a99dc4a4716756871d025bba80b151b3
parent 8f22057724dd8fe2b9d41ba98bfc4da282572c5e
author Andrey Andreev <narf@bofh.bg> 1330686736 +0200
committer Andrey Andreev <narf@bofh.bg> 1330686736 +0200

Merge upstream branch