merge of 08771dbdc0003bc7f360b06dc077cb8a8205a699
authorRod Whitby <rod@whitby.id.au>
Tue, 24 Jan 2006 20:30:23 +0000 (20:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 24 Jan 2006 20:30:23 +0000 (20:30 +0000)
commitb4825542cef9b97462b86f8be1dfb5374727fbbe
tree796b7d496f04205720f82cd9230183862aefbae6
parent5d0af385ab61bd075e89bb4a7bdde5450e97ef0f
parentc6659135578e8466727b9125de47a7a0e34c8b05
merge of 08771dbdc0003bc7f360b06dc077cb8a8205a699
     and 118e8965704196e1da0de17beb55e9816f7b3c89