merge of '5a27dc2251870d3b0fba8216aa90a9b93350f68e'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 20 Aug 2008 00:26:51 +0000 (00:26 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 20 Aug 2008 00:26:51 +0000 (00:26 +0000)
commitd14f1d32d10f03cba0f148a4b38cfb7b9915858d
treef22bcec3620a70c527bd3b3ace850705f21a0496
parent18175b3ef0d09bedf347ce292dd8dd1ec94fa6bf
parentf923801e024e0b18362e51140d59ad94d87af913
Merge ... '5a27dc2251870d3b0fba8216aa90a9b93350f68e'
     and 'f94b55ab9207117d34fe0171c0ec596dc4ac85b5'