merge of 186f778d1d10c9a87957e79c704e1336f936d92c
authorKoen Kooi <koen@openembedded.org>
Sun, 1 Jan 2006 15:23:21 +0000 (15:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 1 Jan 2006 15:23:21 +0000 (15:23 +0000)
commita3fdac39ce87651a939251b37af17e100a530719
tree24da6eb328dfdda034d0d44c68b0d6eb6637304b
parent8a27977a84e6ffcb44333babfffd23df9469b0ec
parent920c2e798f565a66f2db6a7f6cf57846d451b05f
merge of 186f778d1d10c9a87957e79c704e1336f936d92c
     and 9dd1ab5bac61847d1fe071f6cc0431ca2e4fe94f