merge of 0bbfeca4a5e914b371359c7f066b9731f637102a
authorRod Whitby <rod@whitby.id.au>
Mon, 30 Jan 2006 23:31:55 +0000 (23:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 30 Jan 2006 23:31:55 +0000 (23:31 +0000)
commitfdba45cea1cc5644c003b5598350563f0d690a7f
treef77c31cd36af02b67809d5774ce93dcd5edce955
parent6a5fc4fe77b973acc7259d54960b7f0e73b73280
parent1eb8f416a72dd98faea8018e4934bb4420a6ae99
merge of 0bbfeca4a5e914b371359c7f066b9731f637102a
     and cd257fc3be2c2b6a6d43881ec1ebc7fd3b1608ff