merge of '1505fef26a6cdc6bec6d7d7a81b02146504bb790'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Apr 2008 12:35:27 +0000 (12:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Apr 2008 12:35:27 +0000 (12:35 +0000)
commitd1f91195bd908dc4f20ee348963cb3c5f1b8cc2c
treed0d641478f86a590422dc217f92c7c8e387c06d1
parent83a42a93a228f888786dc6aa5151441cdbd96b18
parent785baaa2d0432f753010778a51b7914618af9989
Merge ... '1505fef26a6cdc6bec6d7d7a81b02146504bb790'
     and 'feea3227e23d70e02158cb7ee3b896e6e4d28fe3'