merge of c62fafe15a2128a24d3cea02d65d8f8df34adcbb
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 9 May 2006 15:47:18 +0000 (15:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 May 2006 15:47:18 +0000 (15:47 +0000)
commit83143fcd0fe903b86d8c803934529de4f7ae826d
treebe38f80b22a53e487d5aac90c74def90f73efc40
parent2a0980e7b375a687130a7d319d1e3f1279e87490
parent1375a8fd948fb65deef6a8ac7e54658966d1cbcf
merge of c62fafe15a2128a24d3cea02d65d8f8df34adcbb
     and f37e3f4dc6cffd5d558b57237c19f6d7072bf495