merge of '0639bf215ed95b383ca3a8350a92186db74d524c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 19 Aug 2007 06:35:06 +0000 (06:35 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 19 Aug 2007 06:35:06 +0000 (06:35 +0000)
commit767044e217f546e9f3882688050bbaa4e768252c
tree791801478236e1a9d54bab3941c5764d75444116
parent6730e5f79cfb76cf780f6fe3cbb09a4853379946
parent89b8622bec582a80043d034c636bc4d1b04aa723
Merge ... '0639bf215ed95b383ca3a8350a92186db74d524c'
     and '748f0b4080c69e5c9af7c58036128de6d3b29c83'