merge of '36abf7efee02c5e3db7a7239d57a793afbf6452a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Aug 2007 18:26:06 +0000 (18:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Aug 2007 18:26:06 +0000 (18:26 +0000)
commit69289b150974e7551aeb9bbf6ed7ef9d27fd329d
tree173ff52ea3cb745e61e7ad6b7a165bc3bfad0457
parent524e9cc2d8b84ebbc8d47dc76859740af17fba32
parente06d3f5833d6668834186796be3abfdba296e86f
Merge ... '36abf7efee02c5e3db7a7239d57a793afbf6452a'
     and '92611c6d615003e779f40cd25bf609edd0822a6a'