merge stable changes

author leslie <unknown>

Thu, 10 Jan 2008 18:56:07 +0000 (19:56 +0100)

committer leslie <unknown>

Thu, 10 Jan 2008 18:56:07 +0000 (19:56 +0100)
author leslie <unknown>
Thu, 10 Jan 2008 18:56:07 +0000 (19:56 +0100)
committer leslie <unknown>
Thu, 10 Jan 2008 18:56:07 +0000 (19:56 +0100)
diff --cc po/fi_FI.po
Simple merge
diff --cc systems/nagra/nagra2.c
Simple merge
		1	2
po/fi_FI.po	patch \|	diff1 \|	diff2 \|	blob \| history
systems/nagra/nagra2.c	patch \|	diff1 \|	diff2 \|	blob \| history