merge of '151a325a6a314faf871bda4dbaf1a03741b81e83'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 13 Jun 2007 10:28:43 +0000 (10:28 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 13 Jun 2007 10:28:43 +0000 (10:28 +0000)
commit2782d40793564a0defeb865029862aaf9a93417c
tree899aab2a148c184f3a8040e8455e56d3b4cbf18e
parent34507431261c131688bb5c4553be4b813bd5dcd0
parent28ca62fc66a15d032257ad50ee0540b6eb3e5eaa
Merge ... '151a325a6a314faf871bda4dbaf1a03741b81e83'
     and '64e4141742ce7b9bb873c115920491a60d6fd60d'