merge of 619c2a2f86cda6fa47d337c32bb59fd59bfd2697
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 14 Jun 2006 23:57:56 +0000 (23:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 14 Jun 2006 23:57:56 +0000 (23:57 +0000)
commitfc9beec2c099a3179d3407aeb18a6f84e1696e93
treeaea3533e4d93d6a8a1fdef5fa848483f3faa6189
parent57ad8dc08734e9ecb1026af0a712efabea4f611a
parent18d8eeb8c0504dbfdfe7f11931dd30dcdd5fbcb8
merge of 619c2a2f86cda6fa47d337c32bb59fd59bfd2697
     and 6c5f6dd92dc9e167c3598305801931820379802a