merge of 'a96c9acac99b5599d2b0fb0a518603646414d166'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 15 Mar 2007 22:56:30 +0000 (22:56 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 15 Mar 2007 22:56:30 +0000 (22:56 +0000)
commit21757a5bad963331dcc33cc7ff109476269c03e7
tree317f27080d4d4886cd397a5fd1d5f9785a70f60d
parent8775c527e9c94cfa9c79781eb9112192b6f91fb7
parentc83221df5af4799ba3529c470fcda84c76c0b8f7
Merge ... 'a96c9acac99b5599d2b0fb0a518603646414d166'
     and 'e8fe2283e0bda61a19e3e7f4cf561a638aa1b1fd'