bug 947956 - (Rev 2 for reviewing, adding Mike's patch for takePicture orientation)