From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 27 Nov 2007 17:26:24 +0000 (+0000)
Subject: merge of '61e3209c19410f3d0436f4afa1f9a1429e8f4caa'
X-Git-Tag: Release-2010-05/1~8277
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efe1b31731632d5a53da005ccf2331448e40642f;p=openembedded.git

Merge ... '61e3209c19410f3d0436f4afa1f9a1429e8f4caa'
     and 'b38c38c03c4dcaf924cd4f51807cea915710867f'
---

efe1b31731632d5a53da005ccf2331448e40642f
diff --cc conf/distro/include/sane-srcrevs.inc
index ead766e3ee,e39c1dcd2d..11145fe330
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@@ -28,13 -29,14 +29,14 @@@ SRCREV_pn-gypsy ?= "56
  SRCREV_pn-hildon-1 ?= "14429"
  SRCREV_pn-kismet ?= "2285"
  SRCREV_pn-kismet-newcore ?= "2285"
+ SRCREV_pn-libcalenabler2 ?= "1410"
  SRCREV_pn-libfakekey ?= "1455"
 -SRCREV_pn-libgsmd ?= "3434"
 +SRCREV_pn-libgsmd ?= "3451"
  SRCREV_pn-libgsmd-devel ?= "3293"
 -SRCREV_pn-libjana ?= "665"
 -SRCREV_pn-libmokogsmd2 ?= "3362"
 +SRCREV_pn-libjana ?= "697"
 +SRCREV_pn-libmokogsmd2 ?= "3378"
  SRCREV_pn-libmokojournal2 ?= "3217"
 -SRCREV_pn-libmokopanelui2 ?= "3226"
 +SRCREV_pn-libmokopanelui2 ?= "3349"
  SRCREV_pn-libmokoui2 ?= "3229"
  SRCREV_pn-libowl ?= "277"
  SRCREV_pn-libxosd ?= "627"