merge of 'cc2dee251c099ad31d7d885b6a61f2a647771d53'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Jan 2007 12:01:42 +0000 (12:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Jan 2007 12:01:42 +0000 (12:01 +0000)
commiteb9def83a75c134d31e2143cf2e89132527a5b45
treeb7fd62a43a7a81a958df0f53a4a63ec031f54399
parentc886713bf2977f0bc0add68f44e2b21d63e03a8d
parentd442239bd7c826305a45ec891e37b75865986ee9
Merge ... 'cc2dee251c099ad31d7d885b6a61f2a647771d53'
     and 'd76744543bb9aba107e27bebc49ba78c300eb803'