merge of e588b97112ee40d0ed224469b12043a82ffb1366
authorJustin Patrin <papercrane@gmail.com>
Mon, 16 Jan 2006 20:12:53 +0000 (20:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 20:12:53 +0000 (20:12 +0000)
     and e9149816636e3db5bcc9dc0ca532822828606a50


Trivial merge