merge of 8ccd07ecf96c1e1dae6de3e4a8b449b5ecfcfc1b
authorKoen Kooi <koen@openembedded.org>
Mon, 1 May 2006 19:52:37 +0000 (19:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 May 2006 19:52:37 +0000 (19:52 +0000)
commit39e5e7577246fa9c8fff82c63fb03c3f31e13d21
tree38cc5c7a347bae20dfba36f102251b7392c9f193
parent1d58c916264c6d87021435329b30108cab9819e7
parentcc32ba26daf5112c5f15af67e83ce16f3c3fc748
merge of 8ccd07ecf96c1e1dae6de3e4a8b449b5ecfcfc1b
     and fb542799a227c1e890aa0e36ec4642b6103142cf