merge of '18c78b60a5927032930ff3a527704644b4381596'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 5 Dec 2007 18:04:34 +0000 (18:04 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 5 Dec 2007 18:04:34 +0000 (18:04 +0000)
commit70b054c9eb2a03e0bc074c11dffa02c6250ed22f
treea7dc712ed95198b6e309f47844bf7bccb17fb29b
parent0b65b7aa8f9d5462f9ef95e20e7be1f4dce4ee0d
parente3edba64a6883b049355e12fbb2491a7febc775d
Merge ... '18c78b60a5927032930ff3a527704644b4381596'
     and '8d6f2bff537009418cf71f5bace2396761aeebe3'