merge of 493a78d28839acc304d931942579cdc995529b22
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 20 Jan 2006 12:53:09 +0000 (12:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 20 Jan 2006 12:53:09 +0000 (12:53 +0000)
commit3833d213c0eb428b3664e27e4622fbecdcb3b76e
tree789e28ab3a75d71adbf7536610089c7ce88081cf
parent9293cf9aa20d898b66298fb1557dd30c5acfaaae
parent73e872f13e7891b0594cb3e5bd267940d202865e
merge of 493a78d28839acc304d931942579cdc995529b22
     and dd761723390b7a1bfc45604a0ba56ab6c8e55cba