merge of '1168c6045fce975d6d8f7098c478705bea1622c8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 31 Oct 2007 10:39:15 +0000 (10:39 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 31 Oct 2007 10:39:15 +0000 (10:39 +0000)
commitf16e41eefdbbe863f151dc721fdde025fb401cf5
treef425dc8276b91f582157a54563cd0925739eb9fe
parentaca5ee73eb95e4ee5d3d3b7ee598efc0accac968
parente399391e3fa21c4c7011bf98f630b175686cd31e
Merge ... '1168c6045fce975d6d8f7098c478705bea1622c8'
     and '7eab9a5db962d1b8a39d67ad82cffc92b511633b'