merge of '0289d89398deea4654115c70fb33322c5aea435e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Jan 2007 22:24:10 +0000 (22:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Jan 2007 22:24:10 +0000 (22:24 +0000)
commit3064fa28c3b275d5f2bce72ff1083222f53194d1
treed6adec7d5edc716909b487425e805a3baa529c7e
parent127b5109e790172290734d282ed6b00f1e9a559c
parent4566a87bd955d4cabf5d0363d075ed35f959258a
Merge ... '0289d89398deea4654115c70fb33322c5aea435e'
     and 'bb36d08ccdb518fc32365dbed19d9d236d737b5f'