merge of e248bc9f4ce090838742bfc40304a32cd2d5cdbc
authorRod Whitby <rod@whitby.id.au>
Wed, 17 Aug 2005 14:51:51 +0000 (14:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Aug 2005 14:51:51 +0000 (14:51 +0000)
commit5553aaab6fcd6ade569bf7a09c70769f422a8600
tree0544daab75f7b75e88bae6584f96dcbe56c292bc
parent1c3a6fbc2a5259dae51a6d0001051a9f0f2db9e0
parent6200652ca41dc16d2ca46cc5fbd4db6f73c3ae70
merge of e248bc9f4ce090838742bfc40304a32cd2d5cdbc
     and e4a7fdcbb161ebf763444a06c796d9ea126fa9e1