Kyle Mestery 061d52507d Augment instead of override extra ML2 options.
The existing ML2 code overwrote extra options set in localrc with
defualt values in some cases. This fixes it so it no longer does
that and instead adds to rather than overrides those values.

Fixes bug 1222854

Change-Id: Iafdaad7d4253f1b61e8a214c50adaf7599a641f2
2013-09-09 08:52:19 +00:00
..
2013-09-04 18:10:50 +00:00
2013-09-06 13:35:09 +10:00
2013-07-31 15:48:47 -04:00
2013-08-22 12:30:51 +03:00
2013-08-16 21:57:20 +03:00
2013-07-12 19:29:41 +02:00
2013-08-26 19:45:00 -04:00
2013-03-29 14:36:49 -04:00