merge of '42944a2fa933c39933c8b65cfa592c28efa57387'
authorKoen Kooi <koen@openembedded.org>
Tue, 15 May 2007 17:16:42 +0000 (17:16 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 15 May 2007 17:16:42 +0000 (17:16 +0000)
commit7321a3498b02f87941d8c98f84b6e81f61d5237c
tree862863b9bb72110caddf2153dd3242ed680b910d
parent8eb6fe9baba3848a7619095671e839caa8de6174
parent3566a861498bd0fa8c9e9fec093561fbc6daaaa3
Merge ... '42944a2fa933c39933c8b65cfa592c28efa57387'
     and '5df6035ef92e0f27c836b65338f4cd1a09c506d4'