ipkg arch problem

koen@lieve:/OE/angstrom-tmp/deploy/uclibc/pstage$ cat old.ipkg-at32stk1000.conf 
arch i686 1
arch all 6
arch any 11
arch noarch 16
arch i686 21
arch all 26
arch any 31
arch noarch 36
arch i686 41
arch at32stk1000 46
arch at32stk1000 51
koen@lieve:/OE/angstrom-tmp/deploy/uclibc/pstage$ cat ipkg-at32stk1000.conf 
arch i686 1
arch all 6
arch any 11
arch noarch 16
arch avr32 21
arch avr32 26
arch all 31
arch any 36
arch noarch 41
arch avr32 46
arch at32stk1000 51
arch at32stk1000 56
koen@lieve:/OE/org.openembedded.dev/classes$ mtn diff packaged-staging.bbclass
#
# old_revision [6b1f5fad1dae5c0aeedf5cd50aedf43731a60332]
#
# patch "classes/packaged-staging.bbclass"
#  from [f707ef0f6f9152a768ae4afd3d99ac890c69f125]
#    to [23498f691fbbeb123f0707eabb9a9afa650e023e]
#
============================================================
--- classes/packaged-staging.bbclass    f707ef0f6f9152a768ae4afd3d99ac890c69f125
+++ classes/packaged-staging.bbclass    23498f691fbbeb123f0707eabb9a9afa650e023e
@@ -109,7 +109,7 @@ staging_helper () {
        conffile=${PSTAGE_MACHCONFIG}
        mkdir -p ${DEPLOY_DIR_PSTAGE}/pstaging_lists
        if [ ! -e $conffile ]; then
-               ipkgarchs="${BUILD_ARCH} all any noarch ${TARGET_ARCH} ${PACKAGE_ARCHS} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
+               ipkgarchs="${BUILD_ARCH} all any noarch ${MULTIMACH_ARCH} ${TARGET_ARCH} ${PACKAGE_ARCHS} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}"
                priority=1
                for arch in $ipkgarchs; do
                        echo "arch $arch $priority" >> $conffile