merge of '8e623bd3d9631210d8aa1139b96c2b1091fdd59a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 14:44:53 +0000 (14:44 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 14:44:53 +0000 (14:44 +0000)
     and 'bb994d04cb196a4f4c0d840bf8d094da55d09193'


Trivial merge