Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/

into marcinj.local:/home/hrw/zaurus/bb/openembedded

2005/02/03 12:13:14+01:00 local!hrw
renamed IRK packages to allow both to get into feed
set conflicts/replaces to get only one installed at time

BKrev: 42020765cE4wQU3kGtpeodtL3ySPvQ

diff --git a/packages/irk/irk_0.11-belkin.bb b/packages/irk/irk-belkin_0.11.bb
similarity index 100%
rename from packages/irk/irk_0.11-belkin.bb
rename to packages/irk/irk-belkin_0.11.bb

diff --git a/packages/irk/irk_0.11-targus.bb b/packages/irk/irk_0.11.bb
similarity index 100%
rename from packages/irk/irk_0.11-targus.bb
rename to packages/irk/irk_0.11.bb