merge of '4303b4d9cd0d95a437c5f351f6c879d2ea8bcd19'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 11:55:04 +0000 (11:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 11:55:04 +0000 (11:55 +0000)
commitb982dc7bee8bb4d4e6fc7ba2e27ad438f5347068
treeb905301c99f5c7b73f9bbb511b1b35f3adc926a0
parent8e25448fb01b6fa6ea3a86f9327f080cd753dfbc
parent01e7d07275497448e1b187f0761dfdbbdf0e20f8
Merge ... '4303b4d9cd0d95a437c5f351f6c879d2ea8bcd19'
     and 'ac2e88d3491f6e0cbf4f4435316ab9c6eba69fe7'