Updated documentation for objects default-init-method and default-destroy-method; add section for InitDestroyObjectPostProcessor
Updated documentation and add section for using the [Autowire] attribute inlcuding [Value] and [Qualifier]
Merge branch 'master' of https://github.com/SpringSource/spring-net into DocUpdate
Wrong language setting for XML documentation; added information about autowire inheritence
SPRNET-1543 Changed the default behaviour for GetObjectDefinionNames back to not include ancestors, added additional method that allows via bool parmeter to include parent factories. Other areas get the default inlucde where unit tests needed this options. Consumer of GetObjectDefinitionsNames are checked for potential NPE
Added Generic support for Merge(object) method
Added test method for merged generic dictionary
Merge branch 'master' into DocUpdate

Conflicts:
	doc/reference/src/index.xml
Spell checking
Formatting changes and changes to support .Net 3.5 as it can't handle default method values
Added check if parent IDictionary implementation is ManagedDictionary
Merge pull request #54 from AndreasKl/master

Update to use Apache NMS 1.6
Merge pull request #33 from thomast74/DocUpdate

Code configuration documentation update
Merge pull request #52 from norvegec/master

Added ManagedDictionary.Merge(object) support for generic dictionary
Merge pull request #42 from thomast74/SPRNET-1543

SPRNET-1543 Reviewed GetObjectDefinionNames inconsistencies
Merge pull request #1 from spring-projects/master

Update from head.