merge of 'e98511381d7d86ad5707536e0d5007537577ee60'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Aug 2007 11:22:37 +0000 (11:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Aug 2007 11:22:37 +0000 (11:22 +0000)
commitfe4baf03f970079c5000faa59a352b420c937849
tree946bbdaa80369823e6a7efaf4307ebfc22ffb5b1
parent2ce45e1978c5b30bd41865ec03386f0c35f7da2c
parent8f26b1bd408039f25115aa8b0c650b9bcc332926
Merge ... 'e98511381d7d86ad5707536e0d5007537577ee60'
     and 'fe4756219cdb2d28a29de9a90983c119f541209a'