Merge branch 'master' into backbone
authorBartosz Szatkowski <bulislaw@linux.com>
Mon, 9 Aug 2010 08:14:24 +0000 (10:14 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Mon, 9 Aug 2010 08:14:24 +0000 (10:14 +0200)
1  2 
trunk/src/base/backbone/backbone.cpp

Simple merge