merge of '07ea9deeb7ff9046420d90b9ebec93c6f4210f67'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 14:09:08 +0000 (14:09 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 14:09:08 +0000 (14:09 +0000)
commitc8f060520fa8e2b2668ecb6f7de7ef6f4024fefb
treef867924b155a08ecd47f19095a058a0300b79834
parent033cd72ff9e485ba8b098392e10b8ee23e82f21d
parent040f6e091cd0a94586a116e803a85bf91c57291e
Merge ... '07ea9deeb7ff9046420d90b9ebec93c6f4210f67'
     and '3d864c3b4416d88fac29b7729fd8e83cd4b8aed2'