merge of abf4a17f4b3d256e5b78049b819e1674eeef98d5
authorRod Whitby <rod@whitby.id.au>
Tue, 4 Apr 2006 21:31:48 +0000 (21:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 21:31:48 +0000 (21:31 +0000)
commit21d8fedc27a6b43eb838d120a2da8d18d0b9ce9c
treedd4931baefec1af602d5fb0895ed8345fb246ccb
parentc90a7ccedc038f8739996174ec245c7e2f35dc05
parent5fb61134a9ab692a58998c1e08fb780456abce0b
merge of abf4a17f4b3d256e5b78049b819e1674eeef98d5
     and e5a38d83b512c0a632ec3bd86a9e8066a38574ce