merge of '1d2340f5c0766711d217ca40fbfcb4cb196412ac'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 18 Dec 2006 13:50:04 +0000 (13:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 18 Dec 2006 13:50:04 +0000 (13:50 +0000)
commita29979e19ed76c2029cfd822951b7fde56a98a8e
tree85102cf43b72d5ce2294ab17f565183b4436729d
parent16b15891b993ca44dacd6c15ec678b2eac721548
parent302f1878f6adacd506a24dd55fecc262a57bf61e
Merge ... '1d2340f5c0766711d217ca40fbfcb4cb196412ac'
     and '8bee8c12a8f566036b80dc740f5215782a19eb8b'