merge of '65908f491852a7129b196ced660449bcc1933f90'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 25 Aug 2008 06:35:35 +0000 (06:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 25 Aug 2008 06:35:35 +0000 (06:35 +0000)
commit55be7fd58ffbdaf8733d8f12556817f6c5617e03
treefb9488d34435a8ed7929a9a4da4c7fb4ec42367c
parentc765bc47121d95e8cbc0a6ad71a850e2bcb8f082
parent69cd4b590282088c35967213d400e480150d43c8
Merge ... '65908f491852a7129b196ced660449bcc1933f90'
     and 'f4dabead7ddd765bb651fb44cd9e5d48fb582330'