merge of 897657fc95b12ea51abbdcb9bb8828bfa5a1caca
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 22 Jan 2006 12:00:56 +0000 (12:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jan 2006 12:00:56 +0000 (12:00 +0000)
commitb5a2a12f50424ad15585513e40da17c5b3e613c5
tree96e867bdf6ed2165c1a5db445d147eff68bc3a7a
parentb3959eacd7022f8fa819a488ae624ae479d7d84b
parentf342d6c49ef16ade9e67c868d0c962cd455ca575
merge of 897657fc95b12ea51abbdcb9bb8828bfa5a1caca
     and bf04667bfe2d9cedd68fc1f220beacb16eccdbf9