merge of '7fe4c06ce30cce4695a8e59d2e11f23206fd87c0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 1 Nov 2007 16:12:43 +0000 (16:12 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 1 Nov 2007 16:12:43 +0000 (16:12 +0000)
     and 'c7ee16004be313b8918a1fa2f0bdd3b70fa6d398'


Trivial merge