Merge Opie-Console_CVS Conflict

[vuplus_openembedded] / opie-sshkeys / opie-sshkeys_cvs.oe

diff --git a/opie-sshkeys/opie-sshkeys_cvs.oe b/opie-sshkeys/opie-sshkeys_cvs.oe
index dbbe246..14384ee 100644 (file)
--- a/opie-sshkeys/opie-sshkeys_cvs.oe
+++ b/opie-sshkeys/opie-sshkeys_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RDEPENDS = "ssh opie-sh-ssh-askpass"
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6-cvs-${CVSDATE}"
 APPNAME = "sshkeys"
 APPTYPE = "binary"