merge of 459e8f3f8c5df4c497dd7bbb61a777513bbbfc91
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 24 Apr 2006 23:44:07 +0000 (23:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 23:44:07 +0000 (23:44 +0000)
     and 4ec95ea40239d9c3ce9984d06057070bfbb2b3cb


Trivial merge