merge of '2415386acd7ccac3f0f71353ad8ac290a875573d'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 8 Jun 2007 08:15:04 +0000 (08:15 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 8 Jun 2007 08:15:04 +0000 (08:15 +0000)
commit2db0e90877bbd9b138ef8f9c5947a07ebb0e52fb
tree31ae69806edff4b635f21ee9d341c9e6edacde47
parente2a93800d6958ce44b0c605f42ce1b04013f4463
parentfcefd814ab1591f35de5b397c4dc98b3924ec511
Merge ... '2415386acd7ccac3f0f71353ad8ac290a875573d'
     and 'e538d8716ee5eb008e7cd3e85225100aa38dbbe7'
conf/distro/angstrom-2007.1.conf