merge of '1f2f012d4e3072be1a917b5e7a8798d0990b2134'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 22 Aug 2006 08:57:18 +0000 (08:57 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 22 Aug 2006 08:57:18 +0000 (08:57 +0000)
commitfbb28e1fb0793ae2647060b09e353d322693e12d
tree8b6675574a34f3e224dc0ac19fdb351002f52946
parent71447f62c6b08e13bb2c4ac4429268fc67ab6fa1
parentc0afd4cb563555e06843c196c8af83ad9df1b394
Merge ... '1f2f012d4e3072be1a917b5e7a8798d0990b2134'
     and '8d5edb15fd62844024c79d94ed5d6b8da85d0d36'