merge of 'a0498b1070ee87d8aa57c6ebb87c6bb5b8b8a2f8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Dec 2007 12:01:12 +0000 (12:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Dec 2007 12:01:12 +0000 (12:01 +0000)
commit886be55158efa7796afb0aa0ff60d2085222033f
tree7a3bb29cac971d8017ceb6693268738c67f2be16
parentf1619dffc8727fdd69f259bac4c82119d9c45bb7
parent33bda49c279acf18355f6e9076af1ee7b7862112
Merge ... 'a0498b1070ee87d8aa57c6ebb87c6bb5b8b8a2f8'
     and 'baf350cbcd556f305c1dc7b1d828499cad03979a'