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)
commit3a107b752144b6dd1f6c32dce8b58bd7c54d8568
treec0ec96bb3ef49248e577a85fc28b9de97194acc2
parent3bc9495b3e053a89f39289de8fb843f330f8b74f
parent222af6901fcc2a030293c43a5b7ecef0cb5ea3d7
Merge ... '6491515c0991b335eb83774c7692f5c94ed7c304'
     and '81d9872f28217b716c0f9d6126cca2de05f23309'