merge of '210c562ba9ddf03eaef5986221c80453bb820d06'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 12 Mar 2007 08:03:33 +0000 (08:03 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 12 Mar 2007 08:03:33 +0000 (08:03 +0000)
commit8ba8a9d2d41105cfd19540a2b01c700b075bf397
treedf2d94cfc013618470fffe15880504b194a72e92
parent72554e0157dd579db4b1166cfadfd00200f5325c
parent31919e6fe94364633281f85620cd2290f445f2b5
Merge ... '210c562ba9ddf03eaef5986221c80453bb820d06'
     and 'd475ef60528ca38e050166ebe1d3b28dfd9d3efa'