merge of '11a5d1e39dfa8f07f966376ef34897af5fbb0dc4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Oct 2007 20:24:34 +0000 (20:24 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Oct 2007 20:24:34 +0000 (20:24 +0000)
commit8660878eed049ba2850192caf962b02264aa899c
tree28bab272c177bd0432946ab6b933ab7a9ad0e4ae
parent9d1d85b2cf12d713ef60d369d5dffad2d6c3ef32
parentca0b09b13936b57062a81656396b4a7e2faf24e9
Merge ... '11a5d1e39dfa8f07f966376ef34897af5fbb0dc4'
     and '639885e0849ac3372f3d8cd67349b16fa59b42e8'