merge of 0856e0c924897487f6fe46a20c85d346215d0090
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 14 Aug 2005 23:03:05 +0000 (23:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 23:03:05 +0000 (23:03 +0000)
     and ef312c48edbba5ce136474d6aef3ac78400707b7


Trivial merge