merge of a649313d47adef0c8aa5996b944faf637ae037d5
authorCliff Brake <cbrake@bec-systems.com>
Mon, 19 Jun 2006 20:59:34 +0000 (20:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Jun 2006 20:59:34 +0000 (20:59 +0000)
     and e0460f661f29edf3b8336a54b0ad3e9ed0dc7b94


Trivial merge