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)
     and dd761723390b7a1bfc45604a0ba56ab6c8e55cba


Trivial merge