merge of '1fc3f2af2bc1ab6996667fc87696b79af25ad493'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Aug 2007 16:37:56 +0000 (16:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Aug 2007 16:37:56 +0000 (16:37 +0000)
commitd69667bd98e7fac9404f9a74283fe3c4a63b21fe
treee674213eee5b932d5d05fc4a18e974af63c6f19b
parent681a42f0f9ed259fa6d1747f9282044d5b799ef4
parent087beea232b559c4608cc0b19da699e54ea20774
Merge ... '1fc3f2af2bc1ab6996667fc87696b79af25ad493'
     and '7227e7b465491a16d241c26424306e622bb8da05'