Meg Whitman rejoins P&G's board