merge of '723287caa1b0cd2e362ab6dd69f9e8db2eaca821'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 31 Jan 2008 13:19:04 +0000 (13:19 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 31 Jan 2008 13:19:04 +0000 (13:19 +0000)
commit0ad0ddf04866e53b7ae7d32825132af0d3438e68
tree2a360e033e8c22af8c6f469bd9528a8664fffd8b
parent7ac5c78cc557fb33f6fb5626a756b3f4f4b57ece
parent3a2ff6c671cec5287418f20398f111097f95dd9b
Merge ... '723287caa1b0cd2e362ab6dd69f9e8db2eaca821'
     and '7c64c197c0b8e2b8661ee6bd11dbca6873ccb812'