merged term combo fixes into trunk
authorn.hoffmann <n.hoffmann@localhost>
Tue, 31 Jan 2012 16:56:43 +0000 (16:56 +0000)
committern.hoffmann <n.hoffmann@localhost>
Tue, 31 Jan 2012 16:56:43 +0000 (16:56 +0000)

Trivial merge