merge of '13300dbb95259891ffdb187402ac66a12e7f43c7'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 17 Mar 2007 17:57:46 +0000 (17:57 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 17 Mar 2007 17:57:46 +0000 (17:57 +0000)
commit6142c77d5d691a59157f12d71bcb4f5c9e8837fd
treec6ca12b6f28200fdb87d17d0394369ebb5966871
parent09bb585ba70bc7c651d62c9aa9ac0e57595df31c
parenta828847f3281b8c4254cf89a551c9dcf3e0e4787
Merge ... '13300dbb95259891ffdb187402ac66a12e7f43c7'
     and 'c18417178fcb2dac2e3931442dc1d0cf1ba2e5c8'