From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 20 Feb 2009 21:20:30 +0000 (-0800)
Subject: Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into... 
X-Git-Tag: mv-packages-to-recipes-pre~185^2~6
X-Git-Url: http://code.vuplus.com/gitweb/?a=commitdiff_plain;h=36d3e3dfc03b4dee70c0a804d2045f3f0ba3234d;hp=12c7e9e5fe985c96fee7a8eade6edd0ed2f0c51e;p=vuplus_openembedded

Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
---

diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index f78c804..4515248 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1435,7 +1435,7 @@ PREFERRED_VERSION_phoneserver ?= "1.0"
 PREFERRED_VERSION_php ?= "5.2.0"
 PREFERRED_VERSION_php-native ?= "5.2.0"
 PREFERRED_VERSION_picocom ?= "1.4"
-PREFERRED_VERSION_pidgin ?= "2.2.1"
+PREFERRED_VERSION_pidgin ?= "2.5.3"
 PREFERRED_VERSION_pine ?= "4.64"
 PREFERRED_VERSION_pipeman ?= "1.0.0"
 PREFERRED_VERSION_pipepanic ?= "0.1.1"