merge of 'c8b6f226355d3351327e8b61f52855537a448a23'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 17 Oct 2006 06:44:22 +0000 (06:44 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 17 Oct 2006 06:44:22 +0000 (06:44 +0000)
commite7cefc5706c7631d52842765330823501c61b1c6
treed50c0b04e636d781bb91d90a650ba15a353e1a3e
parentda5e3ee7ecb74a8402c7506d4b1ce180ae0801d9
parentf5e12396ab339e59679231b80a0ff2d4873f06c2
Merge ... 'c8b6f226355d3351327e8b61f52855537a448a23'
     and 'ff788cdac5bbfb991ee004911daf4db1b80ff5ce'