# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: ../mainline/
# testament_sha1: 622dbca749ea3d4b10302fd349b569dffbfae5e3
# timestamp: 2010-06-12 14:57:55 +0530
# base_revision_id: address@hidden
#   0wnt2vpuk198erq4
# 
# Begin patch
=== modified file 'conf/common.rmk'
--- conf/common.rmk	2010-06-11 20:31:16 +0000
+++ conf/common.rmk	2010-06-12 09:23:57 +0000
@@ -201,7 +201,7 @@
 %: util/grub.d/%.in config.status
 	./config.status --file=$@:$<
 	chmod +x $@
-grub-mkconfig_SCRIPTS = 00_header 30_os-prober 40_custom
+grub-mkconfig_SCRIPTS = 00_header 30_os-prober 40_custom 41_custom
 ifneq (, $(host_kernel))
 grub-mkconfig_SCRIPTS += 10_$(host_kernel)
 endif

=== modified file 'util/grub-mkconfig.in'
--- util/grub-mkconfig.in	2010-06-08 10:52:42 +0000
+++ util/grub-mkconfig.in	2010-06-12 09:27:45 +0000
@@ -287,8 +287,11 @@
 #
 # DO NOT EDIT THIS FILE
 #
-# It is automatically generated by $self using templates
-# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/default/grub
+# It is automatically generated by $self using templates from
+# ${grub_mkconfig_dir} and settings from ${sysconfdir}/default/grub
+#
+# You can add additional customizations in ${grub_prefix}/custom.cfg
+# file.  You should create it if it doesn't exists already.
 #
 EOF
 

=== added file 'util/grub.d/41_custom.in'
--- util/grub.d/41_custom.in	1970-01-01 00:00:00 +0000
+++ util/grub.d/41_custom.in	2010-06-12 09:23:57 +0000
@@ -0,0 +1,6 @@
+#!/bin/sh
+cat <<EOF
+if [ -f  \$prefix/custom.cfg ]; then
+ source \$prefix/custom.cfg;
+fi
+EOF

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW1JysIABB1fgAAQfOP//18p
3S6////6YAd3HxQBpQYigJUJFAcwBGCYgGATBNGQ0MAmCMTCUkp5J6M9Kmnp6apnqTQ0wCAAaYTQ
GhhzAEYJiAYBME0ZDQwCYIxMJEiAkwmJlPU8U9Eek9T0mIaaB6jQzRNGhzAEYJiAYBME0ZDQwCYI
xMJJAgAJiZAp6ZCaAKbKeo0NAD1PKcytLaaOAiTU/UPexksUIEcnhNCeDsyqJQ0WO1JnqAmdoOO7
qtyV3rmKdhE8cstMqZlFOHd448uS716Qn99yvJpttsJbPMlvoLE884MmFkJ0R3F7NUU1V1wVqdn4
Pn1GINeR4uTEdm/yceAzflvlfBaGbfpLg6oLa5X69AXGIlZP1oIgeUvtS67fs3bj4uN29R5jcx7m
POf2efikRk5AZAf3PUEWq8V+DpneZ9SgPNDDAiSDPTISqFZMdTeIzXtNTpWXN4FUa7hXnVMJFWIk
Q6iYwK18IdLi7NRERr/1o4xlWmkwRxOYg1EyIxHshIWoiHIckJ8nEmIQIJCgOENOOOEiiQhwIcBB
DPjcMPN6gRLzOcScJfcR9VpbY+4VTI7M/DzP1uSF/Cma8QxyDp8CsRaFeKjmxMdimYSGTVkSzDKV
NbbxwjAcMWgNV9y0nUhrhpPJvnto733X5HBVHFMUhSD3ljxscJ3SN7txJE1yEEaGGEjkJMvhW7GL
WHBhqhLAREtfCc4vJozlsz4ipDOniIZGktNzhTIKuBPdUcB5gPOipLm2gOKhDoF2JLQ3b5goaqYI
mCfEBcpG4snozqyMSUHxnIFs55YHQ27E95TQ9NjTBSVRYwGWRO6GZlIpWJYnDbXEI9Z2PKEVeVUJ
BI4yFM5dK4ylp6xcS/hfgsxbPJ6zLJS5G15TEOZvWtLh1pGQlpO4RZQ7U0KYwKLBKGNFuMBzMIW+
nHYJ8B5abnky23Ewoo0rjilyJUg9SUbwrZES6IWW0NESKqVs4uwEVjq2FnS4vtgVwHYmIFMp2HG8
d6OIlRVryEWm1JfIga3xx1MycmNpF1WBM8pyHGEDeOLsy802mKCFy36WlAvrreIxyr3QgIdcIflA
Swjk8U5eSz0RPsYG6tWSLDIhkVX1Ehk/cPYy9j7zAvGTqt4mibojCkQqGEywMYxJDExAcKA4CiCk
dAqkFVAzb4YtzOgT4zIX7qhbFJuGSghGY1hyk9frEitSuIaG21byHZ13h0U3/2d1PeOs7e3v/mvw
ZUl582pqIwYx4xjGg2TeT3UAe820kwHMFPuO3fueJ7pDOsiRmKS2J72Kz3HpE+jZ92PQesKCbM8k
HmAszX6Y1vDYeTEHl94lRJi2b4vW4/C+NXT5cmFsTiT1ac7TPSN3KyDFQ/AKTnszHD5wPhODqNJJ
SOkGpIZA45zJ0ArL/x+GA15iC/Igy5TxO1hZObbZTWG8+ou5VgJZqp54ySFA11Y8voBj7SIOZy6j
zp08nOve+u7e+s1NxiV0pTAdTweZikI5l1ioZU4uOvmLKvDfnYTT7umgetjowbzPSwxLiPscdu5p
3JU01OsoO5Z6tLaCk8D082TLdUqxuYw1wUoLfEl4k5iVniR18NH/bYy1cbjXQtCKlkWjG1v+B4cr
d2lQvwJgLaW4TDraMk3cj4HhkH3l2sEd+dAiY86TrbwJCLtRtnHi8jxKzpx7Yk9cDocCQpXisExb
KwOYOIkDC0bnC5RjLESqFDLEijOeICrr5hI5tpwODyGQXdwjMJasJwi9olEgX0L/hd0iT3CHmA3Z
mtPAoEMQJZ+Qu4qQImoCgSgLBUrKgz86C2/VT/dJhKTWKoRUtmAs2iPg42EsR8dxTuBxUHp3qpCK
cJHp8lqIiRAzNkHvL/MQuYFqC0cHtEweqwkIkwQm1IjuwhnULUSD8+0cWALsh2glODjmWCNw8ksz
qDZQRFTk4sIDUKAyeGLhOENqJOEcwipoJJUsRCtKRSJTOpMRDAxKAVRn0YNOiIx6pDmgTQMaGjiF
YYlEDGGFNQHSOgQ80nU6CtHqEcx4tcj8r5k4kfW684cRgYBwpziPfWan4LJSICRyWJ6hFq0EMI5E
uTg/cNcgnHcJbb6uGK41iV52NBV5XI9FRXzIvKhImUwhtjhCYrxU5z2mOnXWJFec0WGPPhjh6dEx
sMAgRwEPCpeDJmKWUnBhMkp0E8XZfLeR/LfrQcdHLkREpiyAe4DQiRZ49+12A9wFRwEOeVtIxMQn
qiUpEWQqxOZ0zgIKJY9NQp17JkL9FnxUjmVdVYQAV66pL9CUbhXCL6BI3CX0F9livJSUwJptxv9w
hxkxWBhb8Tf68a0rC3eeKr5N/8XckU4UJBtScrCA