Revision 1234605

Recorded merge of revisions 1226860-1226866,1226868-1227045,1227047-1227067,1227070-1227095,1227097-1227154,1227156-1227174,1227176-1227194,1227196,1227200-1227216,1227218-1227220,1227222-1227311,1227313-1227548,1227550-1228017,1228019-1228041,1228043-1228228,1228230-1228395,1228397-1228879,1228881-1228958,1228960-1229566,1229568-1230274,1230276-1230569,1230571-1231136,1231138-1231590 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x

........
  r1226860 | davsclaus | 2012-01-03 11:46:47 -0500 (Tue, 03 Jan 2012) | 1 line
  
  Content based router - Only set otherwise processor if given
........
  r1227434 | hadrian | 2012-01-04 20:56:41 -0500 (Wed, 04 Jan 2012) | 1 line
  
  CAMEL-3774. Patch applied with thanks to Babak.
........
  r1228606 | cmueller | 2012-01-07 07:37:18 -0500 (Sat, 07 Jan 2012) | 1 line
  
  CAMEL-4870: Attachments is not propagated in the template components such as camel-stringtemplate
........
  r1228677 | cmueller | 2012-01-07 12:35:02 -0500 (Sat, 07 Jan 2012) | 1 line
  
  CAMEL-4845: fix the issues reported by 'mvn -e apache-rat:check'
........
  r1229846 | hadrian | 2012-01-10 20:20:22 -0500 (Tue, 10 Jan 2012) | 1 line
  
  CAMEL-4882. Remove timed out Exchanges from seda queue
........
  r1230754 | cmueller | 2012-01-12 15:16:27 -0500 (Thu, 12 Jan 2012) | 1 line
  
  CAMEL-4885: Upgrade org.springframework 3.0.6.RELEASE -> 3.0.7.RELEASE
........
  r1231590 | cmueller | 2012-01-14 17:20:15 -0500 (Sat, 14 Jan 2012) | 1 line
  
  CAMEL-4884: Make velocity logging configurable
........