merge of '76862bf171f16f2d44c6ea1adf561172aab9a84f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 6 Feb 2007 12:27:58 +0000 (12:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 6 Feb 2007 12:27:58 +0000 (12:27 +0000)
commitfd18e0e54bd0a8c745a8ba655f3e2565beafa65c
treedfa0ec34e73265b8860ae3c709639231446ea7be
parent878be0c4952c38d973b968ff5db6336460b1257b
parent54d51767437734ac3cc691c2b599b59bc6581916
Merge ... '76862bf171f16f2d44c6ea1adf561172aab9a84f'
     and '92202575dd71832a1a1aaef0aa25a6747117cf45'