merge of '301e1ffe69b9e744a6702f0822275dacebc4fbb5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Apr 2007 12:37:30 +0000 (12:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Apr 2007 12:37:30 +0000 (12:37 +0000)
commit3b14315448e576b7146c537b815cc277591cd77e
tree5db7ce5a810c144681ef4db3cc90411b0d5624c8
parentf083247cadbfec447628e30114f920c443af69b0
parent41b13b4beba086ce1eb00bc15a6c27b83f6b3fc5
Merge ... '301e1ffe69b9e744a6702f0822275dacebc4fbb5'
     and 'fc321e37b7fdc2cf0f592c29029177c9e1c4c6a9'