merge of '14cb91ca9bde319dd1a0b9521a6f7b44c8d5d462'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Dec 2006 13:02:22 +0000 (13:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Dec 2006 13:02:22 +0000 (13:02 +0000)
commited03ff0e14485d9ce3cc117ea2f1a9921c5234b3
tree98c087e7fa7f172254e73d0eb8058d0f810cbdbe
parentcbb7e96a766595da9f48dd53784e45fe62db7a76
parentada8de47c0371621a7906edcc624556f21e785ee
Merge ... '14cb91ca9bde319dd1a0b9521a6f7b44c8d5d462'
     and 'cb60d14273a3350c9c89ea8f8808936e25a46b3b'