# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: http://bzr.savannah.gnu.org/r/grub/trunk/grub/
# testament_sha1: ff9d44fe7dc7116a1de2dfdadf80ab847ef3db6b
# timestamp: 2012-03-16 00:31:14 +0900
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog	2012-03-11 22:41:29 +0000
+++ ChangeLog	2012-03-15 15:30:33 +0000
@@ -1,3 +1,8 @@
+2012-03-16  Georgi Georgiev  <address@hidden>
+
+	* util/grub-mkconfig_lib.in: Properly detect if "sort" can do
+	versioned sorting.
+
 2012-03-11  Vladimir Serbinenko  <address@hidden>
 
 	* grub-core/loader/i386/linux.c (allocate_pages): Don't allocate

=== modified file 'util/grub-mkconfig_lib.in'
--- util/grub-mkconfig_lib.in	2012-03-04 22:13:16 +0000
+++ util/grub-mkconfig_lib.in	2012-03-15 15:30:33 +0000
@@ -193,7 +193,7 @@
     no)
       LC_ALL=C sort -n;;
     *)
-      if sort -v </dev/null > /dev/null 2>&1; then
+      if sort -V </dev/null > /dev/null 2>&1; then
         version_sort_sort_has_v=yes
 	LC_ALL=C sort -V
       else

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZzKzbgAAhNfgBAwUXP//1qE
1QC///9wUARZvJCpu6lKDdglFTxT0Qeqek2mMig0eptQDQAMQEpNFPENGgRGjE0BoAGgGgDFGgph
TZTanqeo00NAANBtTIAOYACYAAmAAAAAAkkCATTCnkaT0hglNqbakDI9RkHvOOeq1njFQzWjedgr
r0b6czVEjVgH0UQDmdTYXfcPMV/V43dVCKSV3sBFpcbkhR72tKEXuj5WTUtI3B+isaz3bM9Xm5iG
LRQ2c5rwIl+vTNduZIHWCsQMozhV3XLnz0rLD4RtAiBuRVdNGKOYfyv6npvlGtDIcIqIUzakPecl
0P7LJIOb05i9EN/w8Sl5mJA7xQrkCGeInVGxC4k+AQRpyKPUYtkCLvoNyFyJzaaBMpVSbK0L7wyP
rESIWFoNueyqlCmW1NmYLkauNu0D2Awzf3amlbcT9Kwp9zPoGE1iO7ITkLDHdQQDxYZEDCVmk7YS
DfoOTE2qJqgyZGV3KcprdWBMhuYjICCFCGTwK4WpeQOTxsSA9pBYeADn0sRZpgcFGr4sXz3Gm2BE
8UMcVgYk+za6QCsAomqmCD/1pGRXQ4pZQ0VaDVGJMvjfnLTF8GhXHC0LzYHdDKvgyLcsyigWZVcb
Bx6IysGt3DN6dLnOxUkMpmaccmMbpH84ClCTEJSwSCFaE4NKq1UsmWPQY5xv5QOgjOKpBksM1doy
ElSChkQWagchEoKGUcp7LWQvcsoT0G4NYnTgCNJFORIpL5mZvZMMZuYeXBj9c0J6FxKhsQ/drQqr
GBWpEusK7Tc/50kjZZvR+aPW8u5kdq9a0p11/4KUW8lb1eB0KVRrzv7bxMDUYFpmznUY9WZY9GeE
dODlFRR21aXRQpRD2RiZMreRnxzyrxvCQRLR8USPTf9AJL+EaGRWeSeUxvD5hsDAu1YpO3E6HImm
6MOlSMjXkSMlhUkY8S3yND2w2K3LiIEJ0tRQ4GOilUISHixqKEEhnuKUUIjBWD0R3DPuOLDblMvl
UjmZmo9jkO4psxE6PN7IY+4jAZHXkUM76I9DQX4caIfG4GiHYBpQ0OI3BZr470Fpl4oLPkkb+ZMq
DpIMOExH2R7Iugfjzzhol0R4OMe4eodQ3AcMkNQBQjNHYCk6AeIWIe4HiijP3NrRNqJtTshg1Qyn
Mai4LW+QxPKSqmeMoDDLgPeh64CGQ5PU3ACYUGDsOXHi25Fv+3jxSS5uREPNFJQvdGiOsVdQBlj4
MMDlBORLe61HkjYjK0CZGFTEzz1mIlxIYgPNjfwsYiIRSOgHqADjK6HgFepiVHAhgKRDRb2DCkiJ
DDQKOAm5VPYJseqqA33odPfTorBxUisHMF0RDxbYGsrqjsI6XKgCdR+IIkBU5FxN6oY8MRGFyuCf
gBx/8XckU4UJCcys24A=