merge of '1d187fa547c16ed9ca31c2975f54b8812e88b0f6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 21 Feb 2008 09:40:00 +0000 (09:40 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 21 Feb 2008 09:40:00 +0000 (09:40 +0000)
commit387f7d8d065b710036dcddf2be1b6d1809133acd
treec026ca4fa9e7711969ff63a47f3aa2317cd30ceb
parentbf4b8015982e2cd26049a340f48a2191fd431c11
parent6836f43ea4f5dffc94d623c01cf3c39b56af8eef
Merge ... '1d187fa547c16ed9ca31c2975f54b8812e88b0f6'
     and '7cc9c98056838b4d2eb67baf00c13e220ae94a0a'