Yep, that would be my rec, as well. It's the Brick Street Bakery. Just inside the main entrance to the District (at the end of Trinity St.) on your left.
Oh yeah, I have to third that recommendation. They are especially tasty on a cool morning, then walk over to Balzac's and get an organic blend coffee too.