merge of '3d9d209dc4aaf9913ae7f9891a5736abb9e2d4a7'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 00:14:22 +0000 (00:14 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Jan 2007 00:14:22 +0000 (00:14 +0000)
commit0ba8c7e5d74876994724d14fd60cf2913f8e0cd3
tree7d458acb39cdf222375fe2033f89d1a4b0cec556
parent6d9a04839968cfee92609191b904c9b8ba28ea34
parent6ec38ff016f22f80a2d8ea8b70aa97d5900b9e76
Merge ... '3d9d209dc4aaf9913ae7f9891a5736abb9e2d4a7'
     and '57cd3499be5d92fbeebec0c4a38a62efd8d116ac'