merge of '3c3da8a3266f52fdedbc998f8e7f9dd516cc43eb'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 11:51:48 +0000 (11:51 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 11:51:48 +0000 (11:51 +0000)
commit2b55f24fee0d2266fd9cc429b775986f37258362
treede39b970cd249fa7ad74811372726509797fe0fb
parentd671c0985be1eb24320a3fe17ad17b36014a4ff8
parent3012411202b9e8fea77e548b25a6e4eafece9867
Merge ... '3c3da8a3266f52fdedbc998f8e7f9dd516cc43eb'
     and '97d055550d55ba933c423fa657f7d63d18b81ed6'