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)
     and '8f11add2be832596eef0720d2ab23e1cc7a840b4'


Trivial merge