merge of 'a5c19d4ba5af31a37ae28ae591b4bd7d7623fea3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Mar 2008 17:10:34 +0000 (17:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Mar 2008 17:10:34 +0000 (17:10 +0000)
commitdb27ede75fb7386186f488412999d0e1051f1c2f
tree89fa58a2a560e3f17b11f08ece2cf350cb7d008c
parent2210705c3ec3e65922e83ec6fa956dc015b12f50
parent73dc961f989c929ab7d4812bff1ae1bed174e20e
Merge ... 'a5c19d4ba5af31a37ae28ae591b4bd7d7623fea3'
     and 'c19420734c433c83fc565d689f173063b1294fca'