merge of '6ff9d848f46715bdb745a274b6611f75395b0755'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 27 Feb 2007 17:16:39 +0000 (17:16 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 27 Feb 2007 17:16:39 +0000 (17:16 +0000)
commitbe2fc3e17050b5271d1c51305bfca7d7670e7ba2
tree784266fb908f4c44a83d1c06ab80b510b81eb55d
parentc67d4f59b419ef8f6fb697104f408f042a3f681d
parentd6a28a95a984600a166fc57b4c5e84a8b1648c3e
Merge ... '6ff9d848f46715bdb745a274b6611f75395b0755'
     and 'b5baf49fc7cdce9f5faaa2e3303b691a5a10b339'