merge of 87e4f0da031411c350745ff1cd9325a82c7c3cb9
authorJustin Patrin <papercrane@gmail.com>
Sun, 15 Jan 2006 05:45:44 +0000 (05:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 15 Jan 2006 05:45:44 +0000 (05:45 +0000)
     and e08e5d284b9c3633dc77b46afcf0f14fd5cab232


Trivial merge