merge of 880318acc987af76af9d75d11ad618c846ec19b6
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 29 Mar 2006 13:42:09 +0000 (13:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 29 Mar 2006 13:42:09 +0000 (13:42 +0000)
commit625af418604ed72ab53c850effd75b79146127c7
tree8a457f756c500a0d4161866be71f9cd6c902a3b0
parent1c5f4e12f098c086752379d0e35ef23f25292180
parentc157ad6287aa649414f24cbf3170c9e9ed7b41a6
merge of 880318acc987af76af9d75d11ad618c846ec19b6
     and e7ac37620f70e9c84aa128f610b17504d6c115fd