performed merges in this branch

        Created @6130

unmerged patches (depends, already there, ...)

        version upgrades:       6144 6152 6182 6213 6779 8209
        changelog upgrades:     6212 6773 8208
        depends:                6777
        svn ignores:            7028
        already in trunk:       7033 7757
        this file:              8206 8213

        other reasons
                6519 (see 6629)

STABLE->TRUNK

                6176 6177 6178 -> 6179
                6193 6194 6195 6196 -> 6197
                6203 6204 -> 6205
                6210 -> 6211
                6521 -> 6522
                7023 -> 7024
                7486 7487 -> 7488
                7590 -> 7591
                7758 -> 7759
                8203 -> 8205
                8207 8210 8211 -> 8212

TRUNK->STABLE 

                6131 -> 6132
                6137 6138 -> 6139
                6141 -> 6142 6143
                6145 6146 6147 6148 -> 6149
                6153 -> 6154
                6155 -> 6156
                6157 -> 6159
                6161 6162 -> 6163
                6164 -> 6165
                6167 -> 6169
                6170 -> 6171
                6180 -> 6181
                6184 -> 6185
                6198 6199 -> 6202
                6214 -> 6215
                6236 -> 6237
                6239 -> 6240
                6256 -> 6258
                6285 6286 -> 6287
                6288 -> 6289
                6338 -> 6339
                6340 -> 6341
                6350 -> 6351
                6353 6354 6357 -> 6358
                6418 -> 6419
                6486 -> 6487
                6588 -> 6589
                6765-6768 -> 6769
                6770 6771 -> 6772
                6775 -> 6776
                6377 6465 -> 6778
                7013 -> 7019
                6189 7015 -> 7020
                7016 7017 7018 7021 -> 7022
                7060 -> 7061
                7112 -> 7113
                7131 -> 7132
                7198 -> 7199
                7290 -> 7292
                7489 -> 7490
                7737 -> 7738
                7900 -> 8204

not reviewed: 8214:HEAD