merge of 'a582b05ef4bc8acaf2777e0d19dad2a5be6399f4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Dec 2006 16:41:49 +0000 (16:41 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Dec 2006 16:41:49 +0000 (16:41 +0000)
commit578a0a607455ab673c1b440fdaa2e594b99e5f5c
tree4a62d72ff5930a3cfc1bfaf289fc83b0b4357377
parent88f7caeaddeb1213b25cd5a5b47aee4dd787fda2
parent779b350577b72b2bd9cf00c3f3a9203a1e07cfcb
Merge ... 'a582b05ef4bc8acaf2777e0d19dad2a5be6399f4'
     and 'af0e8d200cec15db232120561f9607ee960928a3'