merge of '28c0b47110d44620be450547dae379ac6a2c8868'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 29 Aug 2007 09:23:36 +0000 (09:23 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 29 Aug 2007 09:23:36 +0000 (09:23 +0000)
commit6cd817942e46d2b17174893ed7f519976162a82e
tree125e0cc07cf90c3425c5be084b3596ab2b56e627
parent50305910d8a9280d68b81050aa30903256d82c0a
parent28693b2f58d789dab35f600f0c94bda39afc1a3d
Merge ... '28c0b47110d44620be450547dae379ac6a2c8868'
     and '309de2f5dd65f1b32e8c78500159efce669b5a24'