merge of '0c72fca9e0c0a27bd39068df21078215a4362b1c'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Aug 2008 23:41:40 +0000 (23:41 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Aug 2008 23:41:40 +0000 (23:41 +0000)
commit0f9476eb4db0ecbf43f07b23d275aace785fb156
tree8316ee76a84aef5ab6d70e816f2b8300adf887a3
parent23c0b79836cbadbfbdfa5f63b39815f85d400984
parentd63f8ac05b7d0d46ddaefa260c940c9134897573
Merge ... '0c72fca9e0c0a27bd39068df21078215a4362b1c'
     and '8f11add2be832596eef0720d2ab23e1cc7a840b4'