merge of 6cbed502eb1ed26562c8c85a641f2c046d0a4f70
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 16 Jan 2006 22:15:59 +0000 (22:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 22:15:59 +0000 (22:15 +0000)
commit47252fc24cbfd80630f5a768bd5ac960b47daace
tree08888fb2dee051fb31fe6206f2bacc2adf7ff3b9
parentf613f68d04446adc7a6d70cf0fe40a87829c9b70
parent18e012cd023b2ef139806a58bf67110b9c4f1abb
merge of 6cbed502eb1ed26562c8c85a641f2c046d0a4f70
     and ad95dcf752605087d27c256e46709c87817b0ff0