merge of '08199c52a592fe71e2675200cf618a439d710884'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 30 Jun 2008 22:07:04 +0000 (22:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 30 Jun 2008 22:07:04 +0000 (22:07 +0000)
commitd4f7af436d07c7bc4dd61ac45bff3414a1c12c74
tree049f5903fea26153466932a6b271c49f10b75ba8
parent873ce28c40814edb45f534003450318c6e9b2650
parent7339a83b4095582728045cee92aa215373607caf
Merge ... '08199c52a592fe71e2675200cf618a439d710884'
     and '3e5f187370604cf4577025ebc49d90ca52a72d4d'