# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@oracle.com-20110127081906-7hcdqfavguz71spq
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/
# testament_sha1: 9f6a5b7cdf715e6c3c9d03b0925b4c24e6acccb7
# timestamp: 2011-01-27 10:20:12 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@oracle.com-20110127081524-\
#   ph910ewwem1u1ar7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZbEeqMAAzTflAAwWmP//1sC
EAC////wBAAIAFAFuV5V2a1bayU6V056scJUymk00BoaaYgAGgGQAASUmkzJlGyU8pp6j1DQAZAA
DIJFNEIwk2SnjVNP0UZMg00PUGgAbVUzTSGmIBoaZAAAAAAkkieTIJpgJoCk9lTeinqZNNPUHppG
7sXmcGfPuPoG44eawHnGM92AXuxkmlKsrnMlOqCOHt6UyMDMYxo99PFH3oUrJX8tkoHO6G4HFFV1
fpdMlksIUdvgk7Xrh4hpOFxArqoUUnucluIICoaEt/uQQNLs3CoGw2z49xrqF5ALEXlyF6BWCkUn
pWz7vY6LtzKnK0R2aIzR3C5iF0u4oFhoZmG2hznTCkwFxnYImtSODKZkC4CegXsa6qcrNcCmKO2l
FohamKma1jQ0RVSVhaUR4Cx4C/7H3EXasF0nCtd5DFQkd+p0DnmXKCSJZmrEqisoK8Qze1JpAy0l
XGW/WZmwOozMYmLoVfhaaiIZshx6itwGvV1+vDuiKLgkMEz9Wk3rH42fhbxG8XNT0R5KasQ8s+QC
mOHI4s+2Kkp0V0OZMTDgRNsgW6DpiDyImK8XJcj7jH3EaECFpJnUWGDldSFkS2Q3SvUcRbCDEr0r
vFqV7ncN9dYQjPBQC4Y3UW1k5JZDc5YwHD5x7g2AxDMWmi7A0PETyHWkZqKsZCnlbsoC4ky5qZOn
PWYYCqK0R0Hvr3ITFznpQbFzbs6hVxhAKh5lNtGssrjeNFaU57idbAcKt5MfCJAqhOkcx7CVDUIZ
tFyLLhUKassoXnVea44Cxi3B2ULtxWKSnVtgkb8xRHvFapxTOEWLBwjYaGY0SZFRRWZ3TltEKFtZ
JVijAUjWnF9tEZWCxYpG1QuCyJZsdE0AUscWjrDgMRgQQricHjhMUDbAilREYiKX2DefEyOAXEjx
hv0nYdpgLcIVdrY0Nv8uUxHNXrTBtULxpdNHMO/I4lAHkLIvJUOu1gKY7tUa3njySFPaOStyQLvC
ROYPV2y1UiPckgXqz2FkLDs3cTSRtEZzHdv0OHYclMfYROQBF/g5iGFwtZby1qfdLqv7xWT0pVMU
hTFR6qbheHL2ci7JhhCvuELA+J6Fj1JXtjzM3XFh867UZVCcR1gKxamhq4sHWW+gtaYNTgwuoUCr
Hw+vr8xmBKaedsFotuOq6o2MeikmNA+NJkRFrlZjIzNWxQvyjj8MnUg8vwcdh/jmMnkjHRxxPYcF
KQvCy+JBv5CcLV3Hjoem9/U6kgnliwGi/WQnkOPg5sG0TAnXjDNLLudNrXjCMbkgGYH4mC2Qpnsm
NxeQiQ2g5VSPzEefQVpyTcgPxz1FVirUX7FgWfQR8CuEwfQlhVeeI0TCw28wcSTQxH9qU8Xh9ZFR
mOkQ/EDiB3HHn9V69MUmOC+SBe5olvSF3NgFIFI5AHQiITB5SuOxncokTABQmmUx/CBZB/R1GkAy
Q5ZmKWosmbA4msnQoFNCJUrYERMkSSgiRGBsSgOAakiuJCYugjnzNBoFMQ+lJDziuoTEgaJcE401
+UIgDoQhM6itbJSKQYxQEzepV79oqi0mNtjqa/DI7xVHEzYWuE7iER0AnlVV0ahfY1hTyVNY2gh8
K8DI00eYAwn6Te9o8l+1dOLhmHHIBiIYMNzEZCqKQoAhYHr1HHR8xOG20cTVk4cTKJhgVhVApSkB
OK+d84ryzcr9EIw5FCVV3oLPdWKq4TAWpzREvZViKl6KLhDUqBR1GQoXqo3BifB/i7kinChIS2I9
UYA=


