merge of '03587c20291556862ac9f9a01ffae714e148ee09'
authorKoen Kooi <koen@openembedded.org>
Sat, 19 May 2007 13:03:00 +0000 (13:03 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 19 May 2007 13:03:00 +0000 (13:03 +0000)
commitdb24711119b9338cf8008ae3a062cfa16196b0d7
tree58961183bdab18642ebc2dee80611f40ff89dd10
parent63f6126ece93dd105ad621405842eb72be236372
parent052a3d9788c209d84bd60a13d2f3c7c940816c9f
Merge ... '03587c20291556862ac9f9a01ffae714e148ee09'
     and '9fd173bf23fee5962a344833fe83c655b9212c30'