merge of '6491515c0991b335eb83774c7692f5c94ed7c304'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 14 Oct 2007 19:08:19 +0000 (19:08 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 14 Oct 2007 19:08:19 +0000 (19:08 +0000)
     and '81d9872f28217b716c0f9d6126cca2de05f23309'


Trivial merge