merge of '6d161d4303314c43fd7d0d04ac9394cb58e8d2bc'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Dec 2007 15:23:39 +0000 (15:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Dec 2007 15:23:39 +0000 (15:23 +0000)
commitec6d8ac59e769365d9615e7e8e0ce515133e9fa3
treea792c0d100dd5b0a396eba526b1bfe661a74fe21
parente2266a64d274a62aafdc41e108523f8330ed76c7
parentc67a512f9b49d04c67cc639b45e6aed028083c6e
Merge ... '6d161d4303314c43fd7d0d04ac9394cb58e8d2bc'
     and '754f491e90085be59caba57db33c41de63535015'