merge of 5a8084e08b69c9be4be7facebd4b8b54f2517284
authorRod Whitby <rod@whitby.id.au>
Tue, 4 Apr 2006 20:35:19 +0000 (20:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 20:35:19 +0000 (20:35 +0000)
commit6998b703e74d8dfc71f0a87757811ae19238d656
tree8a524c1d711dc151af05f1f26d21b7bcd04c235c
parent02b5c1232d8cac8c292232cb33be253758b830ca
parenta4472a7d1c2687e2dad791557ba3a63bcb7281ce
merge of 5a8084e08b69c9be4be7facebd4b8b54f2517284
     and 8155b665cd045405d46ba694ceca0de714a7b535