merge of '9d80f6499c5d862fca19d620f8124ac061dbe754'
authorKoen Kooi <koen@openembedded.org>
Wed, 30 May 2007 14:07:56 +0000 (14:07 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 30 May 2007 14:07:56 +0000 (14:07 +0000)
commitc339f4d93da370a1facd20dd6a8b84f1a531b3a0
tree9293a77b8e9d6635316b50a3dc16f34df41c3976
parentb4bf98b0efcdd1ba0939488e8e026d7dc5084951
parent2cf2658bd42587ef99c4e7ad56196179b924205d
Merge ... '9d80f6499c5d862fca19d620f8124ac061dbe754'
     and 'c7115238d0f3b9fc3434adb41d77441a7ab96991'