tree e79ade1671449820e4e15abe62e2ad1bdaa6f473
parent a3d19c4ac63c4af1c2b823b0962e6be79e89d186
parent 27c80af1dd9b871ab44452a8de22fd9cabaa184c
author Andrey Andreev <narf@bofh.bg> 1328136491 +0200
committer Andrey Andreev <narf@bofh.bg> 1328136491 +0200

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