merge of '3157b6fd0bec0b66971ea7b32ac57dc1a5c92940'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 14 Oct 2007 14:38:23 +0000 (14:38 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 14 Oct 2007 14:38:23 +0000 (14:38 +0000)
commit116726446db49a9dbc97cfedcaa17f9784da9cf2
treec6cc99d0242d814a204fbe5fe17fe70ff0047883
parent21bc47d4b10766613c056a516a975d37b026975a
parentef61764821531cbe7f72a2d78288a6624a421644
Merge ... '3157b6fd0bec0b66971ea7b32ac57dc1a5c92940'
     and 'd4ef8ebf38cc9ef7573a49017e35bd326024f285'