resolve merge
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 19 Apr 2005 11:54:31 +0000 (11:54 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Tue, 19 Apr 2005 11:54:31 +0000 (11:54 +0000)
commita6ae7f14947dc1e5411c8c87dfea40e034a5ada2
tree08b02fd67e2b2cad217978feabebde45e99d6c8f
parent0c7bd9ba4da5dbf31c5b2b704c135dcb385a6bd3
resolve merge

BKrev: 4264f177FoEYCahksw4DzluXFRqQDw
packages/linux/linux-openzaurus_2.6.11.bb