merge of '61e3209c19410f3d0436f4afa1f9a1429e8f4caa'

     and 'b38c38c03c4dcaf924cd4f51807cea915710867f'

diff --cc conf/distro/include/sane-srcrevs.inc
index ead766e,e39c1dc..11145fe
--- 1/conf/distro/include/sane-srcrevs.inc
--- 2/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"