merge of 'c7aa26c35b5e6c0ea55ddf1bb868db044a246b50'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Feb 2007 19:12:21 +0000 (19:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Feb 2007 19:12:21 +0000 (19:12 +0000)
commitc1cd7092d2359fa9661dffbfb0542338f419caff
tree9e86182760945522e01bf43999fae3bfb849d234
parente1e32c67afc50d7b9eafa15052f91fbc80890049
parent9251c62b9606d5304007a38c7a7c14ef41745b2c
Merge ... 'c7aa26c35b5e6c0ea55ddf1bb868db044a246b50'
     and 'ef57153eaf716faf48fc2d4266beddc4dd7b524a'