merge of '4ff3a98585b83fc6b2da66523e59d09c1ce39b20'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Sep 2008 12:30:58 +0000 (12:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Sep 2008 12:30:58 +0000 (12:30 +0000)
commitf98bbbba774cd1fa5c4d320639617218bc74b987
tree68c58f168d088ebf545b68bb977805da1172c1e0
parent0d9c1c3ef0cb4159fa65bd7452f40b7fd6fe20da
parentceaf5dc7a03b36eeebd7ce989c4b414b5f706732
Merge ... '4ff3a98585b83fc6b2da66523e59d09c1ce39b20'
     and '6950cb0adadcf0fa171ec2fdd0751373a16fa294'