[Dbix-class] Two patches for 08 trunk

[Peter Rabbitson]

SGksCgpBdHRhY2hlZCBwbGVhc2UgZmluZCB0d28gcGF0Y2hzZXRzIGZvciByZXZpZXcuIEkgdW5k
ZXJzdGFuZCB0aGF0IGEKcmVsZWFzZSBpcyBsaXRlcmFsbHkga25vY2tpbmcgb24gdGhlIGRvb3Is
IHNvIGlmIGFueXRoaW5nIGhlcmUgbG9va3MKaWZmeSwgZmVlbCBmcmVlIHRvIGRlZmVyIGl0IHVu
dGlsIGFmdGVyIHRoZSByZWxlYXNlLiBBbnkKc3VnZ2VzdGlvbnMvY3JpdGljaXNtIHdlbGNvbWUu
CgpkYmljX2Nhc2NhZGVzLmRpZmYgaW50cm9kdWNlcyB0d28gbmV3IHJlbGF0aW9uc2hpcCBhdHRy
aWJ1dGVzLiBGcm9tIHRoZSBQT0Q6CklmIHlvdSBhcmUgdXNpbmcgU1FMOjpUcmFuc2xhdG9yIHRv
IGNyZWF0ZSBTUUwgZm9yIHlvdSwgeW91IGNhbiB1c2UKdGhlc2UgYXR0cmlidXRlcyB0byBleHBs
aWNpdGx5IHNldCB0aGUgZGVzaXJlZCBPTiBERUxFVEUgb3IgT04gVVBEQVRFCmNvbnN0cmFpbnQg
dHlwZQoKTm90aGluZyBoYWlyeSBpbiB0aGlzIHBhdGNoLCBhIHNsaWdodCByZWZhY3RvciBvZiB0
aGUgU1FMVCBwYXJzZXIgYW5kIHRlc3RzLgoKCmRiaWNfaGFzaHJlZmluZi5kaWZmIGFkZHMgYSB0
ZXN0IGFuZCBmaXhlcyBhIGxvbmdzdGFuZGluZyBidWcgd2l0aCBmdW5ueQpzZWxlY3QvYXMgc2Vh
cmNoZXMuIFRoZSB0ZXN0IGluY2x1ZGVzIGEgY3J1ZGUgYmVuY2htYXJrIG1ha2luZyBzdXJlIHRo
YXQKSSBkaWRuJ3QgaW50cm9kdWNlIGFueSBsYXRlbmNpZXMgd2hlbiByZXdvcmtpbmcgbWtfaGFz
aC4gVGhlIGJlbmNobWFyawpjYW4gKHByb2JhYmx5IHNob3VsZCkgYmUgZGVsZXRlZCBiZWZvcmUg
Y29tbWl0dGluZy4KClRoZSBzZWNvbmQgcGFydCBvZiB0aGUgZGlmZiBhZGRzIGEgZ2xvYmFsIHZh
cmlhYmxlIGZsYWcgd2hpY2ggY2F1c2VzCmluZmxhdGlvbiBvbiBhbGwgdmFsdWVzIGluIGhhc2gg
cmV0dXJuZWQgYnkgdGhlIGluZmxhdG9yICh3aGVyZSB0aGlzIGlzCmFwcGxpY2FibGUgb2YgY291
cnNlKS4gVGhpcyBjb2RlIGhhcyBiZWVuIHVzZWQgaW4gcHJvZHVjdGlvbiBmb3IgbW9yZQp0aGFu
IGEgeWVhciwgYnV0IGZlZWwgZnJlZSB0byBzdGFiIGl0IDopCgpDaGVlcnMKClBldGVyCi0tLS0t
LS0tLS0tLS0tIG5leHQgcGFydCAtLS0tLS0tLS0tLS0tLQpBIG5vbi10ZXh0IGF0dGFjaG1lbnQg
d2FzIHNjcnViYmVkLi4uCk5hbWU6IGRiaWNfY2FzY2FkZXMuZGlmZgpUeXBlOiB0ZXh0L3gtZGlm
ZgpTaXplOiAxMTI3OSBieXRlcwpEZXNjOiBub3QgYXZhaWxhYmxlClVybCA6IGh0dHA6Ly9saXN0
cy5zY3N5cy5jby51ay9waXBlcm1haWwvZGJpeC1jbGFzcy9hdHRhY2htZW50cy8yMDA4MDgyMS8w
M2M5NTk2OS9kYmljX2Nhc2NhZGVzLmJpbgotLS0tLS0tLS0tLS0tLSBuZXh0IHBhcnQgLS0tLS0t
LS0tLS0tLS0KQSBub24tdGV4dCBhdHRhY2htZW50IHdhcyBzY3J1YmJlZC4uLgpOYW1lOiBkYmlj
X2hhc2hyZWZpbmYuZGlmZgpUeXBlOiB0ZXh0L3gtZGlmZgpTaXplOiA3NTY5IGJ5dGVzCkRlc2M6
IG5vdCBhdmFpbGFibGUKVXJsIDogaHR0cDovL2xpc3RzLnNjc3lzLmNvLnVrL3BpcGVybWFpbC9k
Yml4LWNsYXNzL2F0dGFjaG1lbnRzLzIwMDgwODIxLzAzYzk1OTY5L2RiaWNfaGFzaHJlZmluZi5i
aW4K