merge of '917b0d8264255bcc05a47f9b2b7167bf8781ef46'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 30 May 2007 10:17:59 +0000 (10:17 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 30 May 2007 10:17:59 +0000 (10:17 +0000)
commitd5cb13e05fa3b50b352e6d05386bb5db711b6808
tree3a9b582faf6099fbcec73e2b694c4236a8f4e971
parent2a63faf24bf2c3880138734f2f14c4b2f81fd5d2
parent16c55f06c1bcb160697c5465f30434f3b26fede1
Merge ... '917b0d8264255bcc05a47f9b2b7167bf8781ef46'
     and 'd355cc8d988e0476f885987030dc5cdc1fc2614e'