The circuit below feeds a controlled current and voltage to a 3.6v lithium ion battery. The current is limited to 300ma and the voltage is limited to 4.2 volts. The circuit uses a LTC1734 IC from Linear Technology. No diode is needed between the circuit and a 6 volt solar panel. Their SP6-200-12 cranks out about 1 watt while the SP6-300-12 can produce about 2 watts. Assuming a 6 hour sunlit day, the 2 watt panel will pump about 1.8 amp-hours into a battery.