merge of '9addc8085e450d56da3a5559a74f27e8334b960b'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Nov 2006 13:57:11 +0000 (13:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Nov 2006 13:57:11 +0000 (13:57 +0000)
commit5bb7716e36ad65eb9c8fd0e59ee51373a5e60f17
tree6a1abdd68ce1eb92e5440ba2cf2a17f1485225da
parent4e81b4330ca740a8a867a262aa1319a466d26063
parent407324d9ecd56f6506d1ac9b8b4f5b3b22a63bc7
Merge ... '9addc8085e450d56da3a5559a74f27e8334b960b'
     and 'c1863be30dcd78a9ffa2826bafd953535872103b'