merge of '00ab42cecad6f3cff7e430dfe1e456ffab6ee08c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 12:25:21 +0000 (12:25 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 12:25:21 +0000 (12:25 +0000)
commitef937c49f30fa5b7c6656c7f9814cb1fb161e070
tree14bc1fe29481b864b7529bf0c7850f7b3543fdc3
parent8cfed7151d0ccddd91c1485df71b0678212d3859
parent8a5b84520e31fb041d453d10cc1fe0d135b58731
Merge ... '00ab42cecad6f3cff7e430dfe1e456ffab6ee08c'
     and '886f590eaf51aa5f80dff32c73a8d713ce989b3c'