merge of '00ba67c01fec8b792eb0346153ef79f8f229476c'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 12 Jun 2007 11:22:13 +0000 (11:22 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 12 Jun 2007 11:22:13 +0000 (11:22 +0000)
commitab53023c622a7f1e7c57ea0da90a595b09b84d5c
tree85f9e00bfbeed90d0d25f75703795507351532fa
parente734a3261cb2290387eb20d6fc6871b3e2655313
parentd5017a92e89d0d7a5d821fd440e425063a69750c
Merge ... '00ba67c01fec8b792eb0346153ef79f8f229476c'
     and '2639e56359995013fb0dca41ec273945a04fc8a4'