merge stable

author leslie <unknown>

Sat, 25 Jul 2009 07:44:08 +0000 (15:44 +0800)

committer leslie <unknown>

Sat, 25 Jul 2009 07:44:08 +0000 (15:44 +0800)
author leslie <unknown>
Sat, 25 Jul 2009 07:44:08 +0000 (15:44 +0800)
committer leslie <unknown>
Sat, 25 Jul 2009 07:44:08 +0000 (15:44 +0800)
diff --cc cam.c
Simple merge
diff --cc system.c
Simple merge
		1	2
cam.c	patch \|	diff1 \|	diff2 \|	blob \| history
system.c	patch \|	diff1 \|	diff2 \|	blob \| history