tree bc801f54de79a714f80ef2a38febe33cb7af9374
parent 8d7fffc9f0aa49d7bf306060f0676a7b28b7c808
parent 16af6afe991381360439135ddb0735dab1280fed
author Andrey Andreev <narf@bofh.bg> 1328877208 +0200
committer Andrey Andreev <narf@bofh.bg> 1328877208 +0200

Merge remote-tracking branch 'upstream/develop' into develop-image-lib