merge of 325eef6ef0e12e5a9195df6e68307e029355d4bb
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 4 Sep 2005 23:18:07 +0000 (23:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Sep 2005 23:18:07 +0000 (23:18 +0000)
     and 62da1bc1858038e3bf6cd02fbd3e864b46a8d189


Trivial merge