tree dca28c522ea0b20f5187695d7eca1adb4f42e136
parent a8c0a7ff72b1383909f9c374d3c5e560b3f28326
parent 0209c70195384308f06a6c0fc42693c1c649cf46
author Andrey Andreev <narf@bofh.bg> 1328736640 +0200
committer Andrey Andreev <narf@bofh.bg> 1328736640 +0200

Merge upstream branch