merge of '340559c2b56b28b0709e19affb5506c4d8727bc4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 19 Dec 2007 05:16:04 +0000 (05:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 19 Dec 2007 05:16:04 +0000 (05:16 +0000)
commit7eff9a871a4a887c6da0a1fcf3b5bf6ba03598db
tree5fa68b5a6f670a312e9a5254a6eb1c5d750c6905
parentde55817a421bdb5e39d5a51053e606c8ac772222
parent0ae7ffe431b852bf52424f72a608cc4b0b00e608
Merge ... '340559c2b56b28b0709e19affb5506c4d8727bc4'
     and '7636a76a892fc7f94dd1f4061fef697b8e314676'