The Prophet (p.b.u.h) used to offer thirteen rak`at of the night prayer and that included the witr and two rak`at (Sunna) of the Fajr prayer.
Sahih al-Bukhari Book 19, Hadith 21