merge of '7d5c4e9e02ee9f5067a674b75bf7163b0b89b564'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 14 Dec 2006 16:32:34 +0000 (16:32 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 14 Dec 2006 16:32:34 +0000 (16:32 +0000)
commite82e339f306692fe67191cf84c2d68ca737c4013
tree5a56784a173beb9cdb09ed5ece0a97ff760903d5
parentf60a824a4cfc3d554c4c325f65c586081aa03020
parentf03e5e53c4b38c6cd3c73caf319a4796a1e287ba
Merge ... '7d5c4e9e02ee9f5067a674b75bf7163b0b89b564'
     and 'd53336ad58d99d6f07bd94fd6bf31fe2dc1c8d24'