merge of '93cd24c7fe5b0752c90fe9cc0ccbb8f1b492f27e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Mar 2007 09:41:42 +0000 (09:41 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Mar 2007 09:41:42 +0000 (09:41 +0000)
commit7f68ee1345fa873c0bb3a13acbba0f9db9e08376
treee8e8aa35be01053feb33880cd2b2a3cb06f47251
parent9c0ad6b9057fc1b7ee45953c1a53ba27482d6a83
parent2972e6580a3d5b94fd752fddf6dc2bef31cef1a2
Merge ... '93cd24c7fe5b0752c90fe9cc0ccbb8f1b492f27e'
     and 'd4bd4e64e6b804b22b4fd3e003e70d73158f898e'