merge of '3fc90cd6e5ca8fdb9040cd52f97c35c106987f7b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 23 Aug 2007 11:20:51 +0000 (11:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 23 Aug 2007 11:20:51 +0000 (11:20 +0000)
commitf2775f8f90fc58cd5dc6e632c088a976e8c92a04
tree82ce338848d03466189f736b196effb2ad826dd0
parent0c25fa3e7098c3847f4fc3eb042b94d0e142b9b3
parent835c87ebfe46cfc49d03fa9c942b39aa85807a08
Merge ... '3fc90cd6e5ca8fdb9040cd52f97c35c106987f7b'
     and 'dd6e61bbe142013de981e7c21ec321925aa41d52'