merge of 776e1905d2f3baf38c1533b632b4f01946bfc375
authorJustin Patrin <papercrane@gmail.com>
Sun, 7 May 2006 04:13:42 +0000 (04:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 May 2006 04:13:42 +0000 (04:13 +0000)
     and f139a1f31b4ee39ad2590b0acb8dcf142c1e8d72


Trivial merge