-
Committer:
Peter Schuller
-
Date:
2008-03-25 23:12:29 UTC
-
mto:
(3313.1.1 ianc-integration)
-
mto:
This revision was merged to the branch mainline in
revision
3314.
-
Revision ID:
peter.schuller@infidyne.com-20080325231229-w8gguy6uy43z0x63
As per further feedback, use LOCATION instead of MERGE_OR_MERGE_DIRECTIVE.