Merge bk://oe-devel@oe-devel.bkbits.net/packages
[vuplus_openembedded] / opie-showimg / opie-showimg_1.1.7.oe
2004-11-13 Holger FreytherMerge the conflict