Merge branch 'google' of ssh://drop.maemo.org/git/mdictionary into google
authorBartosz Szatkowski <bulislaw@linux.com>
Thu, 26 Aug 2010 09:16:15 +0000 (11:16 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Thu, 26 Aug 2010 09:16:15 +0000 (11:16 +0200)
1  2 
trunk/src/base/backbone/backbone.cpp

Simple merge