merge of 909b9c4ac5356106de74fa307ae1a92da27d3abd
authorFelix Domke <tmbinc@elitedvb.ne>
Sun, 3 Jul 2005 13:29:27 +0000 (13:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 3 Jul 2005 13:29:27 +0000 (13:29 +0000)
     and a65b53634caf2c6a084fd9e5430e25f828fa85d7


Trivial merge