# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
#   l3fml35ahp4p3ea0
# target_branch: http://bzr.savannah.gnu.org/r/emacs/trunk/
# testament_sha1: 0cd955d1ead8af13b51d98dd7612a1b9f3e4902e
# timestamp: 2011-01-25 12:43:04 +0100
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'etc/schema/xhtml-bform.rnc'
--- etc/schema/xhtml-bform.rnc	2007-12-15 11:01:36 +0000
+++ etc/schema/xhtml-bform.rnc	2011-01-25 11:32:35 +0000
@@ -36,6 +36,9 @@
   | "submit"
   | "reset"
   | "hidden"
+  | "file"
+  | "image"
+  | "button"
 select = element select { select.attlist, option+ }
 select.attlist =
   Common.attrib,

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb0xdikAAXjfjAAQUGP/91YB
CAC////0AQAIAFADetq9tXGnUXThkiGmhoTE2qNtVPyaZU/TSGoeoZNMMkmmmmamkzKjynqNNAaa
NANAYZIyTEyU/U00mQaaaAaADRoGAAAAAGg0AaAaASUaVH4kaelM1PTCmgAAyAZFdAXypQZrNZGE
aNMAWZ2ONz3oeBaW2qBE8/AfCwCVBUSxN374b9/j09nV+EIVA8GisWP4DPQqlUECFLXesoYYA8DA
0F0tAfa89HJwrxtJih5gEJxV8rMBWDRgYlgK7y4kMSMhF4EcCh2GB0821lp7vAwGxDLjWcSBBJjX
scQJPMLDUCwO2PveQIIsMGR3oSE3OxM6j6q+1+LpdS1K1N+dcmQ7gNIQgOPzplcVBe8gTzPvrxYG
HSjIY5E4E4VZpExSMTNZ2FMLjVAuEoMApjZNpxtLMkscBU+IaJ2tNGvRoddcConQmjjFAXanNMMs
BrKjQqk7zuPCSiAln4kdipwIxtGtHuF+mYoFU1gSDNbiuaRzERlI43v0EroXsCirVYXvOV5eJ0dI
IMwfc/Azi1HXpdizPpBHzcLnFGRRACRiSAcuwl2hCwKTLuuF51JXMhQeILcJ6Fkdd1hsQKwMXj7m
l945tbKqfMDIGknXqVVx+PMlpe4hR01pQVVh+gmPTIaahNyzNR5gcTSHCzQVRxr7RiLzwWqhVphF
20KmFqxNhYzaGnvGASXv2l+rnD92By3pMFJZdTIcmOk1ymnwnRVDQMQdoF0h7TNMKU6x4cQBFLsn
T8qEKksu2FJQy332IThUkpAYBEVVQNZzr3eNPIRlw59NO2IsucGMRrQ6hfFC8ON8BbwzK8tmVeP4
nPA4thxAsWQK8CdAKOEX8vtjjA5gSjNabPLxubLgPsXzBEutYpPBhXirCuAQNgRaNnnHhzBRKJOS
gnNbBBBLXnwMhOJzkb5wWScPSnUEWCDjSwFG4LQJ7l6PX0lSSqmnJYWRDygMEgklcy0PWrvF6Aus
4ohjDPF5aNjeGYgXXnOYBkREkHCMBmSiVE5AZwAtVZUKak6OxokpeMknDlAdE9typADQAEtbcik2
E71TtJtGctsKNCUwAbQA4BCbUYs8K3czFbiz5byhgfY+puM5eB0YXHG/9KkNRiN7SfmjV+CBuXkf
+vEXckU4UJC9MXYp