merge of '40d52bf1bf72c125584b4da643b7f704470ad4fc'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Oct 2007 13:05:36 +0000 (13:05 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Oct 2007 13:05:36 +0000 (13:05 +0000)
commit6a30acc44364688866c7feafd2756b632ead3008
tree06983947746072b5ff6bc4674b403952c507020c
parent39ff8d86e924cc56ac94b7c07cf2b5f134c11748
parentd04d6c73ae647e2c3129ab3b1aa5b6711db2f431
Merge ... '40d52bf1bf72c125584b4da643b7f704470ad4fc'
     and 'f3f1577d966df858daae7d11db4c333547563bfa'