merge of 0352b5e5aba6317167740a3467df40a576fd6d54
authorRod Whitby <rod@whitby.id.au>
Sat, 7 Jan 2006 05:58:15 +0000 (05:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Jan 2006 05:58:15 +0000 (05:58 +0000)
commitad1444ea6d98b66a200a1f2106de844dc346f957
tree3cc5ee904bd556b9c38ee11b57d638bdb504a57a
parentbe93b605d9379b7001183efc7ca1a80a1f9e2cdd
parent4a9a33b78f011fdaeed2331cfac0f48c69d8dfdf
merge of 0352b5e5aba6317167740a3467df40a576fd6d54
     and 128236d8140e77e43ae65c14a618fef3451a7618