merge of '3e30d03effd5d61bd64c55ec0e69214ced9039ca'
authorKoen Kooi <koen@openembedded.org>
Wed, 8 Aug 2007 14:29:01 +0000 (14:29 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 8 Aug 2007 14:29:01 +0000 (14:29 +0000)
commit552c23e24e7bda6eb86761fde234d3bb1dc89cef
tree45bea000ac3e51fcd95c7fc7873cda83cb299e04
parent60fbc76998faaeb1b9c4f464b9bba5b3d8f0e77e
parent1987d521966951391d2357026ab317e4477ebb7f
Merge ... '3e30d03effd5d61bd64c55ec0e69214ced9039ca'
     and 'bf37569e4e207171af4ea9b1e9879b303cedf759'