merge of aa1a8be266cc5dcd001ac773999d164f125b29a2
authorRod Whitby <rod@whitby.id.au>
Tue, 2 Aug 2005 00:31:12 +0000 (00:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 00:31:12 +0000 (00:31 +0000)
commiteea91968ada14180c77ade6d1a906fdb5ee73d90
treea8890ef0fd80f5e787d885d283f80ed1eebe902a
parenta44d25351b7ed4ece60b04f2c79ea11f61cdcdaf
parent74c476cadf29b164abb6412392620efa08081166
merge of aa1a8be266cc5dcd001ac773999d164f125b29a2
     and d5ca2d9089d0a71c3f006b3ef5b5a276d383f1c1