merge of 7bae67cd8daef4d5a9307341c2352670e31ca3b5
authorJustin Patrin <papercrane@gmail.com>
Sat, 21 Jan 2006 00:20:28 +0000 (00:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 21 Jan 2006 00:20:28 +0000 (00:20 +0000)
     and afe451e4a4ab3d7a152374af3d545c3f4002a864


Trivial merge