merge of '3e6216a45414da116d701e5ace53a09e1c10f258'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jan 2008 17:12:08 +0000 (17:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 4 Jan 2008 17:12:08 +0000 (17:12 +0000)
commit273e148df6f207ad2393d756dfe1202253ed4e8e
tree6111c042ae7ded28fdbd157be71d441e54f7a440
parentbb027b7fa2c875e5749ab0ba0d8579ed0add273c
parente85beb2ff0c9bcbfe59d9ed8fdb6cb294dd58f0b
Merge ... '3e6216a45414da116d701e5ace53a09e1c10f258'
     and 'e42568a54d15c18dcefabdfde6196ebefc9febe1'