diff --git a/examples/sugar b/examples/sugar
new file mode 120000
index 00000000..12f3164b
--- /dev/null
+++ b/examples/sugar
@@ -0,0 +1 @@
+../src/sugar/
\ No newline at end of file
diff --git a/examples/toolbar.py b/examples/toolbar.py
new file mode 100644
index 00000000..e4d24dfd
--- /dev/null
+++ b/examples/toolbar.py
@@ -0,0 +1,32 @@
+import gtk
+from sugar.graphics.toolbar import Toolbar, ToolbarButton
+
+window = gtk.Window()
+
+box = gtk.VBox()
+window.add(box)
+
+toolbar = Toolbar()
+box.pack_start(toolbar, False)
+
+tollbarbutton_1 = ToolbarButton(toolbar, gtk.Button('1'),
+        icon_name='computer-xo',
+        tooltip='foo')
+toolbar.top.insert(tollbarbutton_1, -1)
+
+toolbar.top.insert(gtk.SeparatorToolItem(), -1)
+
+tollbarbutton_2 = ToolbarButton(toolbar, gtk.Button('1'),
+        icon_name='button_cancel',
+        tooltip='foo')
+toolbar.top.insert(tollbarbutton_2, -1)
+
+toolbar.top.insert(gtk.SeparatorToolItem(), -1)
+
+tollbarbutton_3 = ToolbarButton(toolbar, gtk.Button('3'),
+        icon_name='activity-journal',
+        tooltip='foo')
+toolbar.top.insert(tollbarbutton_3, -1)
+
+window.show_all()
+gtk.main()
diff --git a/m4/.gitignore b/m4/.gitignore
index 9f841b0a..e08c7c8f 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1 +1,3 @@
 intltool.m4
+libtool.m4
+lt*.m4
diff --git a/src/sugar/__init__.py b/src/sugar/__init__.py
new file mode 100644
index 00000000..44acb4d7
--- /dev/null
+++ b/src/sugar/__init__.py
@@ -0,0 +1,14 @@
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
diff --git a/src/sugar/_sugarext.so b/src/sugar/_sugarext.so
new file mode 120000
index 00000000..c11ccc78
--- /dev/null
+++ b/src/sugar/_sugarext.so
@@ -0,0 +1 @@
+.libs/_sugarext.so
\ No newline at end of file