merged xapain-letor with trunk and removed .nobootstrap