merge of '1baac115ff1ee3cfa594ac8bdb5a672342a18c6b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 14 Mar 2008 09:52:08 +0000 (09:52 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 14 Mar 2008 09:52:08 +0000 (09:52 +0000)
commit50f201b6234bd8b62e4410e60940ff70a2605852
tree98440d35c452819e953276adf2830879cf441fd3
parent5c378c487e256f1a11cffabf9403346a527704f3
parent23f0dd84f22cf48a4a678022c546b2cd829df54d
Merge ... '1baac115ff1ee3cfa594ac8bdb5a672342a18c6b'
     and '81a7886604b6eb56e9b3e0e7e7a2032428d40826'