merge of '07b7a00cd47af0555ac72032429c0ef42baad5ec'
authorKoen Kooi <koen@openembedded.org>
Wed, 22 Aug 2007 11:17:17 +0000 (11:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 22 Aug 2007 11:17:17 +0000 (11:17 +0000)
commitcf2cc69fb41c99126d0dc55fa8b3585b63a5f361
tree1833bfb3f23390e933d756a30621dbfde1bbe387
parent92e8875b1fd782b8ddfae1d90f273ccf61de4ca0
parentb935b87a114ceb1b15e86792999c7bfc5184bdc4
Merge ... '07b7a00cd47af0555ac72032429c0ef42baad5ec'
     and 'a9b77dce74783f5b5be87dcb91229c55762834fc'