merge of '1b152d2cb9b2c6474294b89bcc5f136f0cd95903'
authorKoen Kooi <koen@openembedded.org>
Wed, 14 May 2008 20:01:07 +0000 (20:01 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 14 May 2008 20:01:07 +0000 (20:01 +0000)
commitfc84e99b863d7d65abd8f0dfc4784e5999e9f0c8
tree0207ce06a848832ef0e66975a5aeffc0735ba007
parente8520e968d6cdb70f8976784bc3332e6d0804e5e
parent2e4cd14fcf25408460f813432161dde3f8ab2fe8
Merge ... '1b152d2cb9b2c6474294b89bcc5f136f0cd95903'
     and '9acacf300b9ee3fb7ed2a73b88356b44ad0ab8d5'