Use a diode bridge: two diodes anode connected to either supply, cathodes both connected to Vcc. Then increase both supplies output voltage by a diode drop (.6V) and connect a big electrolytic and a ceramic capacitor from Vcc to Gnd and you are in business.

Erik

PS: thiss is the "standard" way when one supply and battery backup.

em