I don't remember the analysis details, but in his book, Dr. Howard Johnson shows how to calculate the "observed" rise time of a signal given the rise time and the rise time of a scope.
Sorry, but I would give you a more concrete explanation, but I am "on the road" at the moment and don't have access to my books.