merge of '56aa1dcc42a7cad6e25739df3ce7c61c3112220e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Oct 2007 20:26:39 +0000 (20:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Oct 2007 20:26:39 +0000 (20:26 +0000)
commita6fa515916d4ce2b411e56673cf5fdc65996d026
treed68c06311179b5fbe68562ebfac9c44987d3c2a8
parent511be1b8dda622bcb9d4e43559ad9b36c4431f58
parenta0291fe7d75f7be94e0c5285fd2ce5eb34ae3959
Merge ... '56aa1dcc42a7cad6e25739df3ce7c61c3112220e'
     and '9f32f339a78f7aa0d5fb0c8d6d2a45e3bf7602c6'