merge of 'a2a370156f2400ca17a230cf084e20d1aec57d83'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Sep 2007 10:25:04 +0000 (10:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Sep 2007 10:25:04 +0000 (10:25 +0000)
commit83ee891a55849e09629f74286f5bc10d1e9e782c
tree42b761ed546f618bffdbad944fb9d020fac848cd
parentac2bbb717e1cec2e8d7df4a950f5fca8225faf96
parent390a970fe24cc67d5e96a914f603279c67dff010
Merge ... 'a2a370156f2400ca17a230cf084e20d1aec57d83'
     and 'e4201f3c5efef702c8a5f6804a394e9e3304e1cc'