merge of 56f0ea6b2b447969899f4758a5a538eba3f2b44c
authorAdrian Davey <ade@beth2.org>
Tue, 20 Dec 2005 12:17:52 +0000 (12:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Dec 2005 12:17:52 +0000 (12:17 +0000)
commitcb2d3b7f87c78ddcb9cd639516d177bdfd017c9b
tree10bdc34bfe267bd0457199ff9af9d3ff25d3275b
parent42242f841559c4d9edd452d3ad16ff2f88acf57d
parentc01a09f6a7c80d4794f9ad75b92032c4fda9fcc5
merge of 56f0ea6b2b447969899f4758a5a538eba3f2b44c
     and 70d8a72ef31e0d28a2da35ba944c64a5e5d9d7fb