merge of 'e523e8071d3fe835cfd277ef7adf62c2822468c2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Dec 2007 12:36:16 +0000 (12:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Dec 2007 12:36:16 +0000 (12:36 +0000)
commit6bbbf4ddc955a0880178cf4126ac920b21fa2fd8
treeb990fb5d1a7ad1900ed21d98c8451bb8c720e708
parent5614741d180f628cb95b3e38852bf40fa65a98e7
parentf8104d4640cbf3cf15ed547954fb3159c71378a3
Merge ... 'e523e8071d3fe835cfd277ef7adf62c2822468c2'
     and 'fd336c878a7a068ed14755cf0c44b0a8d70747ac'