tree daed2e56b08396deee820612d377a21c117f6d00
parent 247e122495af3bb5fcd144df89efe9433ca1e31f
parent b211adee89f5fd2192051e9c0826146bd150f469
author Andrey Andreev <narf@bofh.bg> 1328211558 +0200
committer Andrey Andreev <narf@bofh.bg> 1328211558 +0200

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