Merge commit 'refs/merge-requests/2' of git://gitorious.org/sailfish/sailfish into...
authorMichał Januszewski <spock@gentoo.org>
Wed, 26 Jan 2011 22:16:53 +0000 (23:16 +0100)
committerMichał Januszewski <spock@gentoo.org>
Wed, 26 Jan 2011 22:16:53 +0000 (23:16 +0100)
commiteecc0cff565f49cb65371862f0b74530766d309b
treec25f601b5b9dc7bda7b3cd475b568c27ec7cba62
parentc435a76379cf141e3977507a918917a8c05edd72
parent38058bb7fabe5ef489b359c596d21b002b6b6519
Merge commit 'refs/merge-requests/2' of git://gitorious.org/sailfish/sailfish into integration