merge of 455dc2b2093e23d2ff07aff2bc93ea164c0405a5
authorJustin Patrin <papercrane@gmail.com>
Tue, 11 Apr 2006 16:38:55 +0000 (16:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Apr 2006 16:38:55 +0000 (16:38 +0000)
     and d495fb91ff6456715d0a48b5940b134bce1aeb71


Trivial merge