Merge remote branch 'origin/master'

Conflicts:
	modules/base/kspkglist.10.core.inc
	modules/base/kspost.10.core.inc
	modules/signing/finalize.50.makefszip_img.sh

4 files changed, 41 insertions, 12 deletions

diff --git a/examples/f11-xo1.5.ini b/examples/f11-xo1.5.ini
index 9726c0d..2186abe 100644
--- a/examples/f11-xo1.5.ini
+++ b/examples/f11-xo1.5.ini
@@ -53,9 +53,6 @@ favorites_view_add=
 	org.laptop.StopWatchActivity,
 	org.laptop.RecordActivity,
 	org.laptop.community.Finance
-favorites_view_del=
-	org.laptop.Terminal,
-	org.laptop.Log
 
 [sugarlabs_activities]
 sugar_version=0.84
@@ -107,7 +104,7 @@ url_11=http://wiki.laptop.org/images/3/34/ICDL-8.xol
 url_12=http://wiki.laptop.org/images/a/af/WorldFactbookMaps-6.xol
 url_13=http://wiki.laptop.org/images/f/fe/WikisliceChemistry-en-8.xol
 url_14=http://dev.laptop.org/~sj/WorldDigitalLibrary-5.xol
-url_15=dev.laptop.org/~cjb/record-76.xo
+url_15=http://dev.laptop.org/~dsd/record/Record-80.xo
 
 [sugar_activity_group]
 url=http://wiki.laptop.org/go/Activities/G1G1
diff --git a/examples/f11-xo1.ini b/examples/f11-xo1.ini
index f998c05..dc57b07 100644
--- a/examples/f11-xo1.ini
+++ b/examples/f11-xo1.ini
@@ -4,7 +4,7 @@ olpc_version_major=0
 olpc_version_minor=0
 olpc_version_release=0
 target_platform=XO-1
-langs=en,es,ar,pl,pt_BR,pt,it,fr,ht,el,mn,mr_IN,th,am_ET,km_KH,ne_NP,ur_PK,rw,ja,de,tr,te,ps,fa_AF,si,zh_CN
+langs=en_US,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa_AF,si,zh_CN
 modules=
 	base,
 	xo1,
@@ -22,11 +22,6 @@ olpc_publicrpms_1=1,f11
 olpc_publicrpms_2=1,f11-xo1
 add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
-[sugar]
-favorites_view_del=
-	org.laptop.Terminal,
-	org.laptop.Log
-
 [sugar_activity_group]
 url=http://wiki.laptop.org/go/Activities/G1G1Lite
 
diff --git a/examples/olpc-os-10.1.1-xo1.5.ini b/examples/olpc-os-10.1.1-xo1.5.ini
index 6d507c8..e61bc5d 100644
--- a/examples/olpc-os-10.1.1-xo1.5.ini
+++ b/examples/olpc-os-10.1.1-xo1.5.ini
@@ -1,5 +1,5 @@
 [global]
-suggested_oob_version=1.0.0
+suggested_oob_version=1.1.0
 fedora_release=11
 olpc_version_major=10
 olpc_version_minor=1
@@ -8,7 +8,6 @@ target_platform=XO-1.5
 langs=en_US,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa_AF,si,zh_CN
 modules=
 	base,
-	signing,
 	xo1_5,
 	buildnr_from_file,
 	repos,
diff --git a/examples/olpc-os-10.1.2-xo1.ini b/examples/olpc-os-10.1.2-xo1.ini
new file mode 100644
index 0000000..44e2dd0
--- /dev/null
+++ b/examples/olpc-os-10.1.2-xo1.ini
@@ -0,0 +1,38 @@
+[global]
+fedora_release=11
+olpc_version_major=10
+olpc_version_minor=1
+olpc_version_release=2
+target_platform=XO-1
+langs=en_US,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa_AF,si,zh_CN
+modules=
+	base,
+	xo1,
+	buildnr_from_file,
+	jffs2_image,
+	repos,
+	yumcfg,
+	x11,
+	sugar,
+	sugar_activity_group,
+	gnome
+
+[repos]
+olpc_frozen_1=0,koji.dist-f11
+olpc_frozen_2=0,koji.dist-f11-updates-10.1.2
+olpc_frozen_3=1,local.10.1.2
+olpc_frozen_4=1,local.10.1.2-xo1
+add_excludes_to=koji.dist-f11,koji.dist-f11-updates-10.1.2
+
+[yumcfg]
+addrepo_1=0,olpc-fedora-updates,http://mock.laptop.org/repos/koji.dist-f11-updates-10.1.2
+addrepo_2=1,olpc,http://mock.laptop.org/repos/local.10.1.2
+addrepo_3=1,olpc-xo1,http://mock.laptop.org/repos/local.10.1.2-xo1
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+
+[buildnr_from_file]
+path=latestbuild
+
+[sugar_activity_group]
+url=http://wiki.laptop.org/go/Activities/G1G1Lite
+